From 18030db635177d282b4c5bc4a93ff66a91ac11c3 Mon Sep 17 00:00:00 2001 From: Mark Haverkamp Date: Mon, 27 Mar 2006 09:44:33 -0800 Subject: [PATCH] --- yaml --- r: 25797 b: refs/heads/master c: 3d2f98a66571d1aa8d66aab1a97bad6ffff61b24 h: refs/heads/master i: 25795: 31910039b2c539351e2c8cb22b38eff2a85bf470 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/aacraid/linit.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 55adec1c6514..2c630da0c6d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1ad94ad773c34a5a3491f9dcc0a97e264f971f6 +refs/heads/master: 3d2f98a66571d1aa8d66aab1a97bad6ffff61b24 diff --git a/trunk/drivers/scsi/aacraid/linit.c b/trunk/drivers/scsi/aacraid/linit.c index 364232858f71..8d41064406cc 100644 --- a/trunk/drivers/scsi/aacraid/linit.c +++ b/trunk/drivers/scsi/aacraid/linit.c @@ -571,12 +571,12 @@ static long aac_compat_do_ioctl(struct aac_dev *dev, unsigned cmd, unsigned long f = compat_alloc_user_space(sizeof(*f)); ret = 0; - if (clear_user(f, sizeof(*f) != sizeof(*f))) + if (clear_user(f, sizeof(*f)) != sizeof(*f)) ret = -EFAULT; if (copy_in_user(f, (void __user *)arg, sizeof(struct fib_ioctl) - sizeof(u32))) ret = -EFAULT; if (!ret) - ret = aac_do_ioctl(dev, cmd, (void __user *)arg); + ret = aac_do_ioctl(dev, cmd, f); break; }