diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /drivers/scsi/aacraid/commctrl.c | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'drivers/scsi/aacraid/commctrl.c')
| -rw-r--r-- | drivers/scsi/aacraid/commctrl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c index 1fef92d55dee..390cd67c57c0 100644 --- 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) | |||
| 469 | goto cleanup; | 469 | goto cleanup; |
| 470 | } | 470 | } |
| 471 | 471 | ||
| 472 | user_srbcmd = kmalloc(GFP_KERNEL, fibsize); | 472 | user_srbcmd = kmalloc(fibsize, GFP_KERNEL); |
| 473 | if (!user_srbcmd) { | 473 | if (!user_srbcmd) { |
| 474 | dprintk((KERN_DEBUG"aacraid: Could not make a copy of the srb\n")); | 474 | dprintk((KERN_DEBUG"aacraid: Could not make a copy of the srb\n")); |
| 475 | rcode = -ENOMEM; | 475 | rcode = -ENOMEM; |