* [PATCH for v3.15] Fix patch merge mistake
@ 2014-03-29 12:36 Hans Verkuil
0 siblings, 0 replies; only message in thread
From: Hans Verkuil @ 2014-03-29 12:36 UTC (permalink / raw)
To: Linux Media Mailing List, Mauro Carvalho Chehab
Commit 37571b163c15831cd0a213151c21387363dbf15b ("em28xx-dvb: fix PCTV 461e
tuner I2C binding") was merged incorrectly and one chunk ended up in the
wrong function causing a compile error.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index 71e1fca..f599b18 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]);
@@ -1631,6 +1630,7 @@ static int em28xx_dvb_resume(struct em28xx *dev)
em28xx_info("Resuming 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_resume(dvb->fe[0]);
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-03-29 12:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-29 12:36 [PATCH for v3.15] Fix patch merge mistake Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).