USB: mon_bin.c: move assignment out of if () block
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Apr 2015 09:32:56 +0000 (11:32 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 10 May 2015 14:01:11 +0000 (16:01 +0200)
We should not be doing assignments within an if () block
so fix up the code to not do this.

change was created using Coccinelle.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Felipe Balbi <balbi@ti.com>
drivers/usb/mon/mon_bin.c

index 9a62e89..3598f1a 100644 (file)
@@ -675,7 +675,8 @@ static int mon_bin_open(struct inode *inode, struct file *file)
        int rc;
 
        mutex_lock(&mon_lock);
-       if ((mbus = mon_bus_lookup(iminor(inode))) == NULL) {
+       mbus = mon_bus_lookup(iminor(inode));
+       if (mbus == NULL) {
                mutex_unlock(&mon_lock);
                return -ENODEV;
        }
@@ -1018,8 +1019,8 @@ static long mon_bin_ioctl(struct file *file, unsigned int cmd, unsigned long arg
                        return -EINVAL;
 
                size = CHUNK_ALIGN(arg);
-               if ((vec = kzalloc(sizeof(struct mon_pgmap) * (size/CHUNK_SIZE),
-                   GFP_KERNEL)) == NULL) {
+               vec = kzalloc(sizeof(struct mon_pgmap) * (size / CHUNK_SIZE), GFP_KERNEL);
+               if (vec == NULL) {
                        ret = -ENOMEM;
                        break;
                }