|
@@ -1082,7 +1082,8 @@ static int proc_bulk(struct usb_dev_state *ps, void __user *arg)
|
|
|
ret = usbfs_increase_memory_usage(len1 + sizeof(struct urb));
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
- if (!(tbuf = kmalloc(len1, GFP_KERNEL))) {
|
|
|
+ tbuf = kmalloc(len1, GFP_KERNEL);
|
|
|
+ if (!tbuf) {
|
|
|
ret = -ENOMEM;
|
|
|
goto done;
|
|
|
}
|
|
@@ -1224,7 +1225,8 @@ static int proc_setintf(struct usb_dev_state *ps, void __user *arg)
|
|
|
|
|
|
if (copy_from_user(&setintf, arg, sizeof(setintf)))
|
|
|
return -EFAULT;
|
|
|
- if ((ret = checkintf(ps, setintf.interface)))
|
|
|
+ ret = checkintf(ps, setintf.interface);
|
|
|
+ if (ret)
|
|
|
return ret;
|
|
|
|
|
|
destroy_async_on_interface(ps, setintf.interface);
|
|
@@ -1393,7 +1395,8 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb
|
|
|
number_of_packets = uurb->number_of_packets;
|
|
|
isofrmlen = sizeof(struct usbdevfs_iso_packet_desc) *
|
|
|
number_of_packets;
|
|
|
- if (!(isopkt = kmalloc(isofrmlen, GFP_KERNEL)))
|
|
|
+ isopkt = kmalloc(isofrmlen, GFP_KERNEL);
|
|
|
+ if (!isopkt)
|
|
|
return -ENOMEM;
|
|
|
if (copy_from_user(isopkt, iso_frame_desc, isofrmlen)) {
|
|
|
ret = -EFAULT;
|
|
@@ -1904,7 +1907,8 @@ static int proc_releaseinterface(struct usb_dev_state *ps, void __user *arg)
|
|
|
|
|
|
if (get_user(ifnum, (unsigned int __user *)arg))
|
|
|
return -EFAULT;
|
|
|
- if ((ret = releaseintf(ps, ifnum)) < 0)
|
|
|
+ ret = releaseintf(ps, ifnum);
|
|
|
+ if (ret < 0)
|
|
|
return ret;
|
|
|
destroy_async_on_interface (ps, ifnum);
|
|
|
return 0;
|
|
@@ -1919,7 +1923,8 @@ static int proc_ioctl(struct usb_dev_state *ps, struct usbdevfs_ioctl *ctl)
|
|
|
struct usb_driver *driver = NULL;
|
|
|
|
|
|
/* alloc buffer */
|
|
|
- if ((size = _IOC_SIZE(ctl->ioctl_code)) > 0) {
|
|
|
+ size = _IOC_SIZE(ctl->ioctl_code);
|
|
|
+ if (size > 0) {
|
|
|
buf = kmalloc(size, GFP_KERNEL);
|
|
|
if (buf == NULL)
|
|
|
return -ENOMEM;
|