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

Commit 685764b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "This is a couple of small fixes: one is a potential uninitialised
  error variable in the alua code, potentially causing spurious failures
  and the other is a problem caused by the conversion of SCSI to
  hostwide tags which resulted in the qla1280 driver always failing in
  host initialisation"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  qla1280: Don't allocate 512kb of host tags
  scsi_dh_alua: uninitialized variable in alua_rtpg()
parents 4d8bbbff 2bcbc814

drivers/scsi/device_handler/scsi_dh_alua.c

+1 −0
Original line number Diff line number Diff line
@@ -532,6 +532,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) 
		return SCSI_DH_DEV_TEMP_BUSY;



 retry:

	err = 0;

	retval = submit_rtpg(sdev, buff, bufflen, &sense_hdr, pg->flags);



	if (retval) {

drivers/scsi/qla1280.c

+1 −1
Original line number Diff line number Diff line
@@ -4214,7 +4214,7 @@ static struct scsi_host_template qla1280_driver_template = { 
	.eh_bus_reset_handler	= qla1280_eh_bus_reset,

	.eh_host_reset_handler	= qla1280_eh_adapter_reset,

	.bios_param		= qla1280_biosparam,

	.can_queue		= 0xfffff,

	.can_queue		= MAX_OUTSTANDING_COMMANDS,

	.this_id		= -1,

	.sg_tablesize		= SG_ALL,

	.use_clustering		= ENABLE_CLUSTERING,