git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream
[pandora-kernel.git]
/
drivers
/
media
/
dvb
/
dvb-usb
/
dvb-usb-i2c.c
diff --git
a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index
55ba020
..
70df31b
100644
(file)
--- a/
drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/
drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@
-27,6
+27,7
@@
int dvb_usb_i2c_init(struct dvb_usb_device *d)
#endif
d->i2c_adap.algo = d->props.i2c_algo;
d->i2c_adap.algo_data = NULL;
+ d->i2c_adap.dev.parent = &d->udev->dev;
i2c_set_adapdata(&d->i2c_adap, d);