]> err.no Git - linux-2.6/commitdiff
[SCSI] kmalloc argument switcheroo in recent 53c700 change.
authorDave Jones <davej@redhat.com>
Thu, 22 Jun 2006 19:46:15 +0000 (15:46 -0400)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Mon, 26 Jun 2006 14:10:17 +0000 (09:10 -0500)
On Wed, Jun 21, 2006 at 07:00:34PM +0000, Linux Kernel wrote:
 > commit 67d59dfdeb21df2c16dcd478b66177e91178ecd0
 > tree ae85703651d81740f4a6cd398f9dd4d6aabe6a2f
 > parent 6db874fbdbedba5e15e76cc03b42f52ea70338c0
 > author James Bottomley <James.Bottomley@steeleye.com> Wed, 14 Jun 2006 07:31:19 -0500
 > committer James Bottomley <jejb@mulgrave.il.steeleye.com> Tue, 20 Jun 2006 05:34:01 -0500
 >
 > [SCSI] 53c700: remove reliance on deprecated cmnd fields
 >  ...
 >
 > + SDp->hostdata = kmalloc(GFP_KERNEL, sizeof(struct NCR_700_sense));
 > +
 > + if (!SDp->hostdata)
 > + return -ENOMEM;

"I'll take reversed arguments for $100 please Alex".

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/53c700.c

index 3c683dc23541cc017ffb703005400220872feb2f..bff04797739a8669d08e10d9b4fc31f789fb25fe 100644 (file)
@@ -2044,7 +2044,7 @@ NCR_700_slave_configure(struct scsi_device *SDp)
        struct NCR_700_Host_Parameters *hostdata = 
                (struct NCR_700_Host_Parameters *)SDp->host->hostdata[0];
 
-       SDp->hostdata = kmalloc(GFP_KERNEL, sizeof(struct NCR_700_sense));
+       SDp->hostdata = kmalloc(sizeof(struct NCR_700_sense), GFP_KERNEL);
 
        if (!SDp->hostdata)
                return -ENOMEM;