From: Shuah Khan <shuah.kh@samsung.com>
Date: Wed, 9 Jul 2014 13:21:27 +0000 (-0300)
Subject: [media] media: em28xx-dvb - fix em28xx_dvb_resume() to not unregister i2c and dvb
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~155^2~85
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eb5e3399e8f45aa191ad21c0556bece8ea559f2;p=pandora-kernel.git

[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>
---

Reading git-diff-tree failed