Commit 5f17af05 authored by Zhouyang Jia's avatar Zhouyang Jia Committed by Dominik Brodowski
Browse files

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: default avatarZhouyang 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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent be826ada

drivers/scsi/pcmcia/qlogic_stub.c

+5 −1
Original line number Diff line number Diff line
@@ -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)) {