diff options
| author | Zhouyang Jia <jiazhouyang09@gmail.com> | 2018-06-15 01:41:38 +0200 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2018-10-01 12:16:45 +0200 |
| commit | 5f17af054d6a782e7b582d300274d3143fddba5e (patch) | |
| tree | e5ceb198ca59e20847aeba43b71becf1fbca0f53 /drivers/scsi/pcmcia/qlogic_stub.c | |
| parent | char: pcmcia: cm4000_cs: Replace mdelay with usleep_range in set_protocol (diff) | |
| download | linux-5f17af054d6a782e7b582d300274d3143fddba5e.tar.xz linux-5f17af054d6a782e7b582d300274d3143fddba5e.zip | |
pcmcia: add error handling for pcmcia_enable_device in qlogic_stub
When pcmcia_enable_device fails, the lack of error-handling code may
cause unexpected results.
This patch adds error-handling code after calling pcmcia_enable_device
in the qlogic_stub scsi driver.
Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com>
Cc: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
[linux@dominikbrodowski.net: update commit message]
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/scsi/pcmcia/qlogic_stub.c')
| -rw-r--r-- | drivers/scsi/pcmcia/qlogic_stub.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index d4e7e36254b0..173351a8554b 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c @@ -254,8 +254,12 @@ static void qlogic_release(struct pcmcia_device *link) static int qlogic_resume(struct pcmcia_device *link) { scsi_info_t *info = link->priv; + int ret; + + ret = pcmcia_enable_device(link); + if (ret) + return ret; - pcmcia_enable_device(link); if ((info->manf_id == MANFID_MACNICA) || (info->manf_id == MANFID_PIONEER) || (info->manf_id == 0x0098)) { |