Skip to content

Commit

Permalink
Revert "[media] em28xx-dvb: fix PCTV 461e tuner I2C binding"
Browse files Browse the repository at this point in the history
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 37571b1.

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 37571b1
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
  • Loading branch information
Mauro Carvalho Chehab committed Mar 31, 2014
1 parent 3ec40dc commit 5eef220
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions drivers/media/usb/em28xx/em28xx-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 5eef220

Please sign in to comment.