]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 2 May 2019 20:42:02 +0000 (21:42 +0100)
commitabf9aba1ed3e570286d03b8878efc81a549e4a4b
treec3e60c5292a3d32b35d411593a8e631b7aac9c00
parent9b5d63b6dd23f6c2f739b047cba43ef971cda8bb
media: em28xx-dvb - fix em28xx_dvb_resume() to not unregister i2c and dvb

commit 6eb5e3399e8f45aa191ad21c0556bece8ea559f2 upstream.

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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/media/usb/em28xx/em28xx-dvb.c