Skip to content
Snippets Groups Projects
Commit abf9aba1 authored by Shuah Khan's avatar Shuah Khan Committed by Ben Hutchings
Browse files

media: em28xx-dvb - fix em28xx_dvb_resume() to not unregister i2c and dvb


commit 6eb5e339 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: default avatarShuah Khan <shuah.kh@samsung.com>
Reviewed-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 9b5d63b6
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment