Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5eef2203 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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 37571b16.

Reported-by: default avatarChris Lee <updatelee@gmail.com>
Reported-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Cc: stable@vger.kernel.org # Don't apply this patch or 37571b16
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 3ec40dcf

drivers/media/usb/em28xx/em28xx-dvb.c

+0 −10
Original line number Diff line number Diff line
@@ -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;