From: Tomas Winkler <tomas.winkler@intel.com>
Date: Thu, 3 Feb 2011 11:42:41 +0000 (+0200)
Subject: staging/easycap: fix artificial line breaks
X-Git-Tag: MMI-PSA29.97-13-9~20521^2~702
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e0a691e35236d3600c47839c85f82188260e4169;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

staging/easycap: fix artificial line breaks

fix style issue:
		if (NULL !=
				pdata_urb->purb) {
created by the patch:
	'staging/easycap: don't cast NULL pointer'

After dropping the casting there is no longer 80 columns
limitation

Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c
index fcfa11d8dd5c..c453633ae9c0 100644
--- a/drivers/staging/easycap/easycap_main.c
+++ b/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++;
 				}