[staging-next 04/10 V2] staging/easycap: fix artificial line breaks
Tomas Winkler
tomas.winkler at intel.com
Tue Feb 1 11:42:11 UTC 2011
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
Cc: Mike Thomas <rmthomas at sciolus.org>
Reported-by: Dan Carpenter <error27 at gmail.com>
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
---
drivers/staging/easycap/easycap_main.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c
index fcfa11d..c453633 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++;
}
--
1.7.3.5
---------------------------------------------------------------------
Intel Israel (74) Limited
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
More information about the devel
mailing list