Fix patch merge mistake

PATCH New Hans Verkuil 1 participant 1 message Mar 29, 2014

Subsystems (2)

Media (V4L/DVB) EM28XX VIDEO4LINUX driver

lore

Share & tools

lore

Hans Verkuil

author

2014-03-29 12:37 UTC #0 lore raw

PATCH 1/1 Fix patch merge mistake

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 <[email protected]>

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

index 71e1fca..f599b18 100644
@@ -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]);