aboutsummaryrefslogtreecommitdiff
path: root/tools/perf/scripts/python/bin
diff options
context:
space:
mode:
authorShuah Khan <[email protected]>2014-07-09 10:21:27 -0300
committerMauro Carvalho Chehab <[email protected]>2014-07-26 11:03:36 -0300
commit6eb5e3399e8f45aa191ad21c0556bece8ea559f2 (patch)
treea15ef9fc35e7306bf9e80f3633837d16a6d2b1eb /tools/perf/scripts/python/bin
parent89c5ff0557f8faf15cd1461c8d91608c0e404921 (diff)
[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 <[email protected]> Reviewed-by: Antti Palosaari <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/bin')
0 files changed, 0 insertions, 0 deletions