From fc5e7517c2504722d22599b787d18900ef52f657 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Thu, 5 Aug 2010 17:29:55 -0300
Subject: [PATCH] --- yaml --- r: 219516 b: refs/heads/master c:
 3074fc8432223937985e138bde1270a03fc75628 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/video/bt8xx/bttv-i2c.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

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;