From: Dave Jones <davej@redhat.com>
Date: Thu, 22 Jun 2006 19:46:15 +0000 (-0400)
Subject: [SCSI] kmalloc argument switcheroo in recent 53c700 change.
X-Git-Tag: v2.6.18-rc1~22^2^2~57
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4311fa60b0d1cb5a2f62f646978294bca7b46cbb;p=linux-2.6

[SCSI] kmalloc argument switcheroo in recent 53c700 change.

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>
---

diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index 3c683dc235..bff0479773 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -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;