]> git.karo-electronics.de Git - karo-tx-linux.git/commit
[media] media: em28xx-dvb - fix em28xx_dvb_resume() to not unregister i2c and dvb
authorShuah Khan <shuah.kh@samsung.com>
Wed, 9 Jul 2014 13:21:27 +0000 (10:21 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Sat, 26 Jul 2014 14:03:36 +0000 (11:03 -0300)
commit6eb5e3399e8f45aa191ad21c0556bece8ea559f2
treea15ef9fc35e7306bf9e80f3633837d16a6d2b1eb
parent89c5ff0557f8faf15cd1461c8d91608c0e404921
[media] media: em28xx-dvb - fix em28xx_dvb_resume() to not unregister i2c and dvb

em28xx_dvb_resume() unregisters i2c tuner, i2c demod, and dvb.
This erroneous cleanup results in i2c tuner, i2c demod, and dvb
devices unregistered and removed during resume. This error is a
result of merge conflict between two patches that went into 3.15.

Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/usb/em28xx/em28xx-dvb.c