Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: usblp.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.

Acked-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Felipe Balbi <balbi@ti.com>

+10 -5
+10 -5
drivers/usb/class/usblp.c
··· 660 660 switch (cmd) { 661 661 662 662 case LPGETSTATUS: 663 - if ((retval = usblp_read_status(usblp, usblp->statusbuf))) { 663 + retval = usblp_read_status(usblp, usblp->statusbuf); 664 + if (retval) { 664 665 printk_ratelimited(KERN_ERR "usblp%d:" 665 666 "failed reading printer status (%d)\n", 666 667 usblp->minor, retval); ··· 694 693 struct urb *urb; 695 694 char *writebuf; 696 695 697 - if ((writebuf = kmalloc(transfer_length, GFP_KERNEL)) == NULL) 696 + writebuf = kmalloc(transfer_length, GFP_KERNEL); 697 + if (writebuf == NULL) 698 698 return NULL; 699 - if ((urb = usb_alloc_urb(0, GFP_KERNEL)) == NULL) { 699 + urb = usb_alloc_urb(0, GFP_KERNEL); 700 + if (urb == NULL) { 700 701 kfree(writebuf); 701 702 return NULL; 702 703 } ··· 735 732 transfer_length = USBLP_BUF_SIZE; 736 733 737 734 rv = -ENOMEM; 738 - if ((writeurb = usblp_new_writeurb(usblp, transfer_length)) == NULL) 735 + writeurb = usblp_new_writeurb(usblp, transfer_length); 736 + if (writeurb == NULL) 739 737 goto raise_urb; 740 738 usb_anchor_urb(writeurb, &usblp->urbs); 741 739 ··· 984 980 int rc; 985 981 986 982 rc = -ENOMEM; 987 - if ((urb = usb_alloc_urb(0, GFP_KERNEL)) == NULL) 983 + urb = usb_alloc_urb(0, GFP_KERNEL); 984 + if (urb == NULL) 988 985 goto raise_urb; 989 986 990 987 usb_fill_bulk_urb(urb, usblp->dev,