Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

[karo-tx-linux.git] / drivers / scsi / aacraid / commctrl.c

diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index d005ad77378d6e47ca124850c997ba3d84225ef8..85387099aab238db175a7b53a238a819f597ba3e 100644 (file)
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -469,7 +469,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                goto cleanup;
        }
 
-       user_srbcmd = kmalloc(GFP_KERNEL, fibsize);
+       user_srbcmd = kmalloc(fibsize, GFP_KERNEL);
        if (!user_srbcmd) {
                dprintk((KERN_DEBUG"aacraid: Could not make a copy of the srb\n"));
                rcode = -ENOMEM;