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 <[email protected]>
Cc: James E.J. Bottomley <[email protected]>
Cc: Martin K. Petersen <[email protected]>
Cc: [email protected]
[[email protected]: update commit message]
Signed-off-by: Dominik Brodowski <[email protected]>

diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index d4e7e36254b0badb62484a39ac033b851bf4f4ec..173351a8554bc58b5e84bad5b2b024942d363dd9 100644 (file)
--- 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)) {