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

Commit 06a43d17 authored by Salyzyn, Mark's avatar Salyzyn, Mark Committed by James Bottomley
Browse files

[SCSI] aacraid: variable redefinition hides earlier warning 



The parameter 'info' is reused, renamed the second to sinfo to
represent supplemental adapter info, to suppress compile warning
message.

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

drivers/scsi/aacraid/aachba.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1240,24 +1240,24 @@ int aac_get_adapter_info(struct aac_dev* dev) 
	memcpy(&dev->adapter_info, info, sizeof(*info));

	memcpy(&dev->adapter_info, info, sizeof(*info));





	if (dev->adapter_info.options & AAC_OPT_SUPPLEMENT_ADAPTER_INFO) {

	if (dev->adapter_info.options & AAC_OPT_SUPPLEMENT_ADAPTER_INFO) {

		struct aac_supplement_adapter_info * info;

		struct aac_supplement_adapter_info * sinfo;





		aac_fib_init(fibptr);

		aac_fib_init(fibptr);





		info = (struct aac_supplement_adapter_info *) fib_data(fibptr);

		sinfo = (struct aac_supplement_adapter_info *) fib_data(fibptr);





		memset(info,0,sizeof(*info));

		memset(sinfo,0,sizeof(*sinfo));





		rcode = aac_fib_send(RequestSupplementAdapterInfo,

		rcode = aac_fib_send(RequestSupplementAdapterInfo,

				 fibptr,

				 fibptr,

				 sizeof(*info),

				 sizeof(*sinfo),

				 FsaNormal,

				 FsaNormal,

				 1, 1,

				 1, 1,

				 NULL,

				 NULL,

				 NULL);

				 NULL);





		if (rcode >= 0)

		if (rcode >= 0)

			memcpy(&dev->supplement_adapter_info, info, sizeof(*info));

			memcpy(&dev->supplement_adapter_info, sinfo, sizeof(*sinfo));

	}

	}