diff --git a/[refs] b/[refs]
index 41a3d3d1901f..9c4dd209be42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5457b7bdf284d683880163a4c59fdde2f84325a
+refs/heads/master: 7c596fa964806acb3b5ababb7ec4e1da35b140b3
diff --git a/trunk/drivers/media/video/bw-qcam.c b/trunk/drivers/media/video/bw-qcam.c
index 0edd05ebcc3f..7f7e3d3398d0 100644
--- a/trunk/drivers/media/video/bw-qcam.c
+++ b/trunk/drivers/media/video/bw-qcam.c
@@ -104,7 +104,7 @@ static inline void write_lpdata(struct qcam_device *q, int d)
 
 static inline void write_lpcontrol(struct qcam_device *q, int d)
 {
-	if(0x20 & d) {
+	if (d & 0x20) {
 		/* Set bidirectional mode to reverse (data in) */
 		parport_data_reverse(q->pport);
 	} else {
@@ -355,11 +355,11 @@ static int qc_detect(struct qcam_device *q)
 	/* Be (even more) liberal in what you accept...  */
 
 /*	if (count > 30 && count < 200) */
-	if (count > 20 && count < 400)
-	{
+	if (count > 20 && count < 400) {
 		return 1;	/* found */
 	} else {
-		printk(KERN_ERR "No Quickcam found on port %s\n", q->pport->name);
+		printk(KERN_ERR "No Quickcam found on port %s\n",
+			q->pport->name);
 		return 0;	/* not found */
 	}
 }