diff --git a/[refs] b/[refs]
index 81293b0ad395..49d77ebeb7d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fc0dae888ee216036ae1898fc9186f1dd04f185
+refs/heads/master: e0a691e35236d3600c47839c85f82188260e4169
diff --git a/trunk/drivers/staging/easycap/easycap_main.c b/trunk/drivers/staging/easycap/easycap_main.c
index fcfa11d8dd5c..c453633ae9c0 100644
--- a/trunk/drivers/staging/easycap/easycap_main.c
+++ b/trunk/drivers/staging/easycap/easycap_main.c
@@ -316,8 +316,7 @@ if (true == other) {
 	peasycap_standard = &easycap_standard[0];
 	while (0xFFFF != peasycap_standard->mask) {
 		if (true == ntsc) {
-			if (NTSC_M ==
-				peasycap_standard->v4l2_standard.index) {
+			if (NTSC_M == peasycap_standard->v4l2_standard.index) {
 				peasycap->inputset[input].standard_offset =
 						peasycap_standard -
 							&easycap_standard[0];
@@ -3631,8 +3630,7 @@ for (i = 0; i < pusb_interface->num_altsetting; i++) {
 		return -EFAULT;
 	}
 	pusb_interface_descriptor = &(pusb_host_interface->desc);
-	if (NULL ==
-						pusb_interface_descriptor) {
+	if (NULL == pusb_interface_descriptor) {
 		SAM("ERROR: pusb_interface_descriptor is NULL\n");
 		return -EFAULT;
 	}
@@ -4650,8 +4648,7 @@ case 0: {
 			pdata_urb = list_entry(plist_head,
 					struct data_urb, list_head);
 			if (NULL != pdata_urb) {
-				if (NULL !=
-						pdata_urb->purb) {
+				if (NULL != pdata_urb->purb) {
 					usb_kill_urb(pdata_urb->purb);
 					m++;
 				}
@@ -4671,8 +4668,7 @@ case 2: {
 			pdata_urb = list_entry(plist_head,
 					struct data_urb, list_head);
 			if (NULL != pdata_urb) {
-				if (NULL !=
-						pdata_urb->purb) {
+				if (NULL != pdata_urb->purb) {
 					usb_kill_urb(pdata_urb->purb);
 					m++;
 				}