diff options
Diffstat (limited to '0033-uss720.c-move-assignment-out-of-if-block.patch')
| -rw-r--r-- | 0033-uss720.c-move-assignment-out-of-if-block.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/0033-uss720.c-move-assignment-out-of-if-block.patch b/0033-uss720.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..9533cb0ab3a2ae --- /dev/null +++ b/0033-uss720.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,43 @@ +From eda9a7e388cbf13b7fbabeb7d903f3aae5523944 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:32 +0200 +Subject: [PATCH 33/36] uss720.c: move assignment out of if () block + +We should not be doing assignments within an if () block +so fix up the code to not do this. + +change was created using Coccinelle. + +CC: Andy Shevchenko <andriy.shevchenko@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/misc/uss720.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c +index 588d62a73e1a..bbd029c9c725 100644 +--- a/drivers/usb/misc/uss720.c ++++ b/drivers/usb/misc/uss720.c +@@ -714,7 +714,8 @@ static int uss720_probe(struct usb_interface *intf, + /* + * Allocate parport interface + */ +- if (!(priv = kzalloc(sizeof(struct parport_uss720_private), GFP_KERNEL))) { ++ priv = kzalloc(sizeof(struct parport_uss720_private), GFP_KERNEL); ++ if (!priv) { + usb_put_dev(usbdev); + return -ENOMEM; + } +@@ -723,7 +724,8 @@ static int uss720_probe(struct usb_interface *intf, + kref_init(&priv->ref_count); + spin_lock_init(&priv->asynclock); + INIT_LIST_HEAD(&priv->asynclist); +- if (!(pp = parport_register_port(0, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, &parport_uss720_ops))) { ++ pp = parport_register_port(0, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, &parport_uss720_ops); ++ if (!pp) { + printk(KERN_WARNING "uss720: could not register parport\n"); + goto probe_abort; + } +-- +2.3.7 + |