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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is an automatic generated email to let you know that the following patch were queued at the 
http://git.linuxtv.org/media_tree.git tree:

Subject: Revert "[media] em28xx-dvb: fix PCTV 461e tuner I2C binding"
Author:  Mauro Carvalho Chehab <m.chehab@xxxxxxxxxxx>
Date:    Mon Mar 31 07:48:26 2014 -0300

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@xxxxxxxxx>
Reported-by: Hans Verkuil <hverkuil@xxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # Don't apply this patch or 37571b163c15
Signed-off-by: Mauro Carvalho Chehab <m.chehab@xxxxxxxxxxx>

 drivers/media/usb/em28xx/em28xx-dvb.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

---

http://git.linuxtv.org/media_tree.git?a=commitdiff;h=5eef22031295234990a26d809efb4100c1e60c11

diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index 71e1fca..9b3f033 100644
--- 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;
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]