diff mbox

[v2] pcmcia: add error handling for pcmcia_enable_device

Message ID 1528968207-48671-1-git-send-email-jiazhouyang09@gmail.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Zhouyang Jia June 14, 2018, 9:23 a.m. UTC
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.

Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com>
---
v1->v2:
- Remove pcmcia_disable_device.
---
 drivers/scsi/pcmcia/qlogic_stub.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Andy Shevchenko June 14, 2018, 9:39 a.m. UTC | #1
On Thu, Jun 14, 2018 at 12:23 PM, Zhouyang Jia <jiazhouyang09@gmail.com> wrote:
> When pcmcia_enable_device fails, the lack of error-handling code may
> cause unexpected results.

What results?
You need to elaborate this.,

> This patch adds error-handling code after calling pcmcia_enable_device.

> +       int ret;
> +
> +       ret = pcmcia_enable_device(link);
> +       if (ret)
> +               return -ENODEV;

And why not to return ret?
diff mbox

Patch

diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 0556054..eb2c8bf 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 -ENODEV;
 
-	pcmcia_enable_device(link);
 	if ((info->manf_id == MANFID_MACNICA) ||
 	    (info->manf_id == MANFID_PIONEER) ||
 	    (info->manf_id == 0x0098)) {