Merge branch 'master' into for-next

2 files changed, 10 insertions, 5 deletions

diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 9c0c9117853..1a5bf572475 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -655,9 +655,9 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                                 /* Does this really need to be GFP_DMA? */
                                 p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);
                                 if(!p) {
-                                        kfree (usg);
-                                        dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",
+                                        dprintk((KERN_DEBUG "aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",
                                           usg->sg[i].count,i,usg->count));
+                                        kfree(usg);
                                         rcode = -ENOMEM;
                                         goto cleanup;
                                 }
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index e9373a2d14f..33898b61fdb 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -705,12 +705,17 @@ static int aac_cfg_open(struct inode *inode, struct file *file)
  *      Bugs: Needs to handle hot plugging
  */
 
-static int aac_cfg_ioctl(struct inode *inode, struct file *file,
+static long aac_cfg_ioctl(struct file *file,
                 unsigned int cmd, unsigned long arg)
 {
+        int ret;
         if (!capable(CAP_SYS_RAWIO))
                 return -EPERM;
-        return aac_do_ioctl(file->private_data, cmd, (void __user *)arg);
+        lock_kernel();
+        ret = aac_do_ioctl(file->private_data, cmd, (void __user *)arg);
+        unlock_kernel();
+
+        return ret;
 }
 
 #ifdef CONFIG_COMPAT
@@ -1029,7 +1034,7 @@ ssize_t aac_get_serial_number(struct device *device, char *buf)
 
 static const struct file_operations aac_cfg_fops = {
         .owner          = THIS_MODULE,
-        .ioctl          = aac_cfg_ioctl,
+        .unlocked_ioctl = aac_cfg_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = aac_compat_cfg_ioctl,
 #endif