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

Commit 4def7fa1 authored by Salyzyn, Mark's avatar Salyzyn, Mark Committed by James Bottomley
Browse files

[SCSI] aacraid: fix aacraid not finding device 



Thanks for the help from Steve Fox and Duane Cox investigating this
issue, I'd like to report that we found the problem. The issue is with
the patch Steve Fox isolated below, by not accommodating older adapters
properly and issuing a command they do not support when retrieving
storage parameters about the arrays. This simple patch resolves the
problem (and more accurately mimics the logic of the original code
before the patch).

Signed-off-by: default avatarMark Salyzyn <aacraid@adaptec.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 144ff8bf

drivers/scsi/aacraid/aachba.c

+1 −2
Original line number Diff line number Diff line
@@ -503,8 +503,7 @@ static int _aac_probe_container1(void * context, struct fib * fibptr) 
	dresp = (struct aac_mount *) fib_data(fibptr);

	dresp->mnt[0].capacityhigh = 0;

	if ((le32_to_cpu(dresp->status) != ST_OK) ||

	    ((le32_to_cpu(dresp->mnt[0].vol) != CT_NONE) &&

	     (le32_to_cpu(dresp->mnt[0].state) == FSCS_HIDDEN)))

	    (le32_to_cpu(dresp->mnt[0].vol) != CT_NONE))

		return _aac_probe_container2(context, fibptr);

	scsicmd = (struct scsi_cmnd *) context;

	scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;