These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / mon / mon_bin.c

diff --git a/kernel/drivers/usb/mon/mon_bin.c b/kernel/drivers/usb/mon/mon_bin.c
index 9a62e89..3598f1a 100644 (file)
--- a/kernel/drivers/usb/mon/mon_bin.c
+++ b/kernel/drivers/usb/mon/mon_bin.c
@@ -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;
                }