diff options
| author | Antti Palosaari <crope@iki.fi> | 2014-04-10 22:11:27 -0300 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-08-08 15:24:38 +0900 |
| commit | b26fde727c7808d2d9a6e2f21e75f44e4ab5e64a (patch) | |
| tree | bea6d4980a062de8ad77c5a23a234a2071b11d27 /drivers/media/usb/em28xx/em28xx-dvb.c | |
| parent | 804a15bd0624e525c09efb3d14ff3daf06b9eda5 (diff) | |
| download | linux-3.10-b26fde727c7808d2d9a6e2f21e75f44e4ab5e64a.tar.gz linux-3.10-b26fde727c7808d2d9a6e2f21e75f44e4ab5e64a.tar.bz2 linux-3.10-b26fde727c7808d2d9a6e2f21e75f44e4ab5e64a.zip | |
upstream: [media] em28xx: add [2013:025f] PCTV tripleStick (292e)
Empia EM28178, Silicon Labs Si2168, Silicon Labs Si2157.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Conflicts:
drivers/media/usb/em28xx/em28xx-dvb.c
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-dvb.c')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-dvb.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c index ddc511f18ab..a121ed9561f 100644 --- a/drivers/media/usb/em28xx/em28xx-dvb.c +++ b/drivers/media/usb/em28xx/em28xx-dvb.c @@ -1729,6 +1729,13 @@ static int em28xx_dvb_resume(struct em28xx *dev) i2c_unregister_device(client); } + /* remove I2C demod */ + client = dvb->i2c_client_demod; + if (client) { + module_put(client->dev.driver->owner); + i2c_unregister_device(client); + } + em28xx_unregister_dvb(dvb); kfree(dvb); dev->dvb = NULL; |