diff --git a/[refs] b/[refs]
index aa315f7fb1fb..283c53fdb355 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab599a6d474e0dd4db3557a46dd15cff6e126d0b
+refs/heads/master: 3074fc8432223937985e138bde1270a03fc75628
diff --git a/trunk/drivers/media/video/bt8xx/bttv-i2c.c b/trunk/drivers/media/video/bt8xx/bttv-i2c.c
index d502f4106e56..d49b675045fe 100644
--- a/trunk/drivers/media/video/bt8xx/bttv-i2c.c
+++ b/trunk/drivers/media/video/bt8xx/bttv-i2c.c
@@ -121,9 +121,8 @@ bttv_i2c_wait_done(struct bttv *btv)
 
 	/* timeout */
 	if (wait_event_interruptible_timeout(btv->i2c_queue,
-		btv->i2c_done, msecs_to_jiffies(85)) == -ERESTARTSYS)
-
-	rc = -EIO;
+	    btv->i2c_done, msecs_to_jiffies(85)) == -ERESTARTSYS)
+		rc = -EIO;
 
 	if (btv->i2c_done & BT848_INT_RACK)
 		rc = 1;