git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 89c5ff0)
[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)
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 patch | blob | history

diff --cc drivers/media/usb/em28xx/em28xx-dvb.c
Simple merge
Pandora Kernel Repository