git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
pci
/
cx18
/
cx18-gpio.c
diff --git
a/drivers/media/pci/cx18/cx18-gpio.c
b/drivers/media/pci/cx18/cx18-gpio.c
index 160c8377e3521b6cf495b848b490eb1b85de9b01..c85eb8d2583702ccefd9e211072ccd4969eb98dc 100644
(file)
--- a/
drivers/media/pci/cx18/cx18-gpio.c
+++ b/
drivers/media/pci/cx18/cx18-gpio.c
@@
-307,7
+307,7
@@
int cx18_gpio_register(struct cx18 *cx, u32 hw)
void cx18_reset_ir_gpio(void *data)
{
- struct cx18 *cx = to_cx18(
(struct v4l2_device *)
data);
+ struct cx18 *cx = to_cx18(data);
if (cx->card->gpio_i2c_slave_reset.ir_reset_mask == 0)
return;