Revert "[media] em28xx-dvb: fix PCTV 461e tuner I2C binding"

The first hunk of this patch got merged wrong, likely due to some
changes at the em28xx resume code. Revert it to reapply it right.

This reverts commit 37571b163c15831cd0a213151c21387363dbf15b.

Reported-by: Chris Lee <updatelee@gmail.com>
Reported-by: Hans Verkuil <hverkuil@xs4all.nl>
Cc: stable@vger.kernel.org # Don't apply this patch or 37571b163c15
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index 71e1fcac050008ab366667576c5a915901bba342..9b3f033e1f098114adcd7449f7dc69151143b2bf 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -1603,7 +1603,6 @@ static int em28xx_dvb_suspend(struct em28xx *dev)
        em28xx_info("Suspending DVB extension");
        if (dev->dvb) {
                struct em28xx_dvb *dvb = dev->dvb;
-               struct i2c_client *client = dvb->i2c_client_tuner;
 
                if (dvb->fe[0]) {
                        ret = dvb_frontend_suspend(dvb->fe[0]);
@@ -1641,15 +1640,6 @@ static int em28xx_dvb_resume(struct em28xx *dev)
                        ret = dvb_frontend_resume(dvb->fe[1]);
                        em28xx_info("fe1 resume %d", ret);
                }
-               /* remove I2C tuner */
-               if (client) {
-                       module_put(client->dev.driver->owner);
-                       i2c_unregister_device(client);
-               }
-
-               em28xx_unregister_dvb(dvb);
-               kfree(dvb);
-               dev->dvb = NULL;
        }
 
        return 0;