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

Commit deb81d80 authored by James Bottomley's avatar James Bottomley Committed by James Bottomley
Browse files

[SCSI] add failure return to scsi_init_shared_tag_map() 



And use it in the stex driver.

Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent cf355883

drivers/scsi/stex.c

+2 −3
Original line number Diff line number Diff line
@@ -1108,9 +1108,8 @@ stex_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (err)

		goto out_free_irq;



	scsi_init_shared_tag_map(host, ST_CAN_QUEUE);

	if (host->bqt == NULL) {

		err = -ENOMEM;

	err = scsi_init_shared_tag_map(host, ST_CAN_QUEUE);

	if (err) {

		printk(KERN_ERR DRV_NAME "(%s): init shared queue failed\n",

			pci_name(pdev));

		goto out_free_irq;

include/scsi/scsi_tcq.h

+2 −1
Original line number Diff line number Diff line
@@ -138,9 +138,10 @@ static inline struct scsi_cmnd *scsi_find_tag(struct scsi_device *sdev, int tag) 
 * @shost:	the host to share the tag map among all devices

 * @depth:	the total depth of the map

 */

static inline void scsi_init_shared_tag_map(struct Scsi_Host *shost, int depth)

static inline int scsi_init_shared_tag_map(struct Scsi_Host *shost, int depth)

{

	shost->bqt = blk_init_tags(depth);

	return shost->bqt ? 0 : -ENOMEM;

}



#endif /* _SCSI_SCSI_TCQ_H */