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

Commit 4a4384ce authored by Stephen Cameron's avatar Stephen Cameron Committed by James Bottomley
Browse files

hpsa: do not ignore return value of hpsa_register_scsi 



add error handling for failure when registering with SCSI subsystem.

Reviewed-by: default avatarScott Teel <scott.teel@pmcs.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@Suse.de>
Signed-off-by: default avatarDon Brace <don.brace@pmcs.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent 360c73bd

drivers/scsi/hpsa.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -7408,7 +7408,9 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	h->access.set_intr_mask(h, HPSA_INTR_ON);

	h->access.set_intr_mask(h, HPSA_INTR_ON);





	hpsa_hba_inquiry(h);

	hpsa_hba_inquiry(h);

	hpsa_register_scsi(h);	/* hook ourselves into SCSI subsystem */

	rc = hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */

	if (rc)

		goto clean4;





	/* Monitor the controller for firmware lockups */

	/* Monitor the controller for firmware lockups */

	h->heartbeat_sample_interval = HEARTBEAT_SAMPLE_INTERVAL;

	h->heartbeat_sample_interval = HEARTBEAT_SAMPLE_INTERVAL;