diff --git a/[refs] b/[refs]
index 55bf31ce05af..9ed556f7679c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dd8be8c94d0f273685092106daf0875d9287da0
+refs/heads/master: 51e9dd3249eba4654f12a9473b8bfb5ddbf00d00
diff --git a/trunk/drivers/staging/cx25821/cx25821-i2c.c b/trunk/drivers/staging/cx25821/cx25821-i2c.c
index f4f2681d8f1c..f727b85743ac 100644
--- a/trunk/drivers/staging/cx25821/cx25821-i2c.c
+++ b/trunk/drivers/staging/cx25821/cx25821-i2c.c
@@ -159,9 +159,9 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
 
 	return msg->len;
 
-      eio:
+eio:
 	retval = -EIO;
-      err:
+err:
 	if (i2c_debug)
 		printk(KERN_ERR " ERR: %d\n", retval);
 	return retval;
@@ -223,9 +223,9 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
 	}
 
 	return msg->len;
-      eio:
+eio:
 	retval = -EIO;
-      err:
+err:
 	if (i2c_debug)
 		printk(KERN_ERR " ERR: %d\n", retval);
 	return retval;
@@ -266,7 +266,7 @@ static int i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
 	}
 	return num;
 
-      err:
+err:
 	return retval;
 }
 
@@ -319,7 +319,7 @@ int cx25821_i2c_register(struct cx25821_i2c *bus)
 
 	bus->i2c_client.adapter = &bus->i2c_adap;
 
-	//set up the I2c
+	/* set up the I2c */
 	bus->i2c_client.addr = (0x88 >> 1);
 
 	return bus->i2c_rc;