Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dcd4a7f authored by Salyzyn, Mark's avatar Salyzyn, Mark Committed by James Bottomley
Browse files

[SCSI] aacraid: fix multiple definition of automatic variable warning. 



The 'entry' automatic variable was defined at the top and within a
block that uses it, removed the definition from the block that uses
it. Some cosmetic changes were made while in the same file. This patch
should be inert.

Signed-off-by: default avatarMark Salyzyn <aacraid@adaptec.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent a3940da5

drivers/scsi/aacraid/commctrl.c

+4 −5
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ static int next_getadapter_fib(struct aac_dev * dev, void __user *arg) 
	 */

return_fib:

	if (!list_empty(&fibctx->fib_list)) {

		struct list_head * entry;

		/*

		 *	Pull the next fib from the fibs

		 */
@@ -582,7 +581,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) 
				void* p;

				/* Does this really need to be GFP_DMA? */

				p = kmalloc(upsg->sg[i].count,GFP_KERNEL|__GFP_DMA);

				if(p == 0) {

				if(!p) {

					dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",

					  upsg->sg[i].count,i,upsg->count));

					rcode = -ENOMEM;
@@ -626,7 +625,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) 
				void* p;

				/* Does this really need to be GFP_DMA? */

				p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);

				if(p == 0) {

				if(!p) {

					kfree (usg);

					dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",

					  usg->sg[i].count,i,usg->count));
@@ -668,7 +667,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) 
				void* p;

				/* Does this really need to be GFP_DMA? */

				p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);

				if(p == 0) {

				if(!p) {

					dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",

					  usg->sg[i].count,i,usg->count));

					rcode = -ENOMEM;
@@ -698,7 +697,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) 
				dma_addr_t addr;

				void* p;

				p = kmalloc(upsg->sg[i].count, GFP_KERNEL);

				if(p == 0) {

				if (!p) {

					dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",

					  upsg->sg[i].count, i, upsg->count));

					rcode = -ENOMEM;