summaryrefslogtreecommitdiff
path: root/drivers/staging/easycap/easycap_main.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2011-02-03 13:42:41 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-04 12:44:31 -0800
commite0a691e35236d3600c47839c85f82188260e4169 (patch)
treef9eeeb35e8d670ceabc85ac533e7a9bc639cb692 /drivers/staging/easycap/easycap_main.c
parent3fc0dae888ee216036ae1898fc9186f1dd04f185 (diff)
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>
Diffstat (limited to 'drivers/staging/easycap/easycap_main.c')
-rw-r--r--drivers/staging/easycap/easycap_main.c12
1 files changed, 4 insertions, 8 deletions
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++;
}