From deb81d80ba27da8dfabc29ccb5977db8f4942a0a Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@steeleye.com>
Date: Fri, 1 Sep 2006 09:28:48 -0400
Subject: [PATCH] [SCSI] add failure return to scsi_init_shared_tag_map()
And use it in the stex driver.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---
drivers/scsi/stex.c | 5 ++---
include/scsi/scsi_tcq.h | 3 ++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 15fb99f224ee16..3cf3106a29b8e4 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -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;
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h
index 4eea254b1ce9e2..d04d05adfa9b68 100644
--- a/include/scsi/scsi_tcq.h
+++ b/include/scsi/scsi_tcq.h
@@ -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 */
--
GitLab