diff --git a/[refs] b/[refs]
index 523df6713067..bd977af69048 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 955e6ed843ddddb57cf599584574c505175cd86f
+refs/heads/master: bae94dc39e9530842379208c4406512d34dc7ef3
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-417.c b/trunk/drivers/media/video/cx231xx/cx231xx-417.c
index a5b1b13d1fd6..b5b69989ff8d 100644
--- a/trunk/drivers/media/video/cx231xx/cx231xx-417.c
+++ b/trunk/drivers/media/video/cx231xx/cx231xx-417.c
@@ -1053,16 +1053,15 @@ static int cx231xx_load_firmware(struct cx231xx *dev)
 	/*download the firmware by ep5-out*/
 
 	for (frame = 0; frame < (int)(CX231xx_FIRM_IMAGE_SIZE*20/_buffer_size);
-		frame++) {
+	     frame++) {
 		for (i = 0; i < _buffer_size; i++) {
-			*(p_buffer+i) =
-			(u8)(*(p_fw+(frame*128*8+(i++/4))) & 0x000000FF);
-			*(p_buffer+i) =
-			(u8)((*(p_fw+(frame*128*8+(i++/4))) & 0x0000FF00)>>8);
-			*(p_buffer+i) =
-			(u8)((*(p_fw+(frame*128*8+(i++/4))) & 0x00FF0000)>>16);
-			*(p_buffer+i) =
-			(u8)((*(p_fw+(frame*128*8+(i/4))) & 0xFF000000)>>24);
+			*(p_buffer + i) = (u8)(*(p_fw + (frame * 128 * 8 + (i / 4))) & 0x000000FF);
+			i++;
+			*(p_buffer + i) = (u8)((*(p_fw + (frame * 128 * 8 + (i / 4))) & 0x0000FF00) >> 8);
+			i++;
+			*(p_buffer + i) = (u8)((*(p_fw + (frame * 128 * 8 + (i / 4))) & 0x00FF0000) >> 16);
+			i++;
+			*(p_buffer + i) = (u8)((*(p_fw + (frame * 128 * 8 + (i / 4))) & 0xFF000000) >> 24);
 		}
 		cx231xx_ep5_bulkout(dev, p_buffer, _buffer_size);
 	}