From patchwork Mon Jun 11 05:15:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhouyang Jia X-Patchwork-Id: 10457177 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 52C6460467 for ; Mon, 11 Jun 2018 05:16:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FBA027F81 for ; Mon, 11 Jun 2018 05:16:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32CCF27F54; Mon, 11 Jun 2018 05:16:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D899427F54 for ; Mon, 11 Jun 2018 05:16:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754010AbeFKFQe (ORCPT ); Mon, 11 Jun 2018 01:16:34 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:46609 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753911AbeFKFQb (ORCPT ); Mon, 11 Jun 2018 01:16:31 -0400 Received: by mail-pf0-f193.google.com with SMTP id q1-v6so9581395pff.13; Sun, 10 Jun 2018 22:16:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=9HnoT00GA/e4hqOrOsR5vOygtqQIU8ZliGrohbyJ7B8=; b=YpQq/U/pDVPE8Ir+DaDWKrS3GbzC8URtjRh1KR5kYS0eRxbIrqzXvC9ilQvL0n8rOr foS+VJo3IKHoV+7hMeRnafS4UIdCzJijASkRAfO6YNph69B0uPXkl74CVBmXWgOrR250 aTfyNjUgdw0ik7CtV6VXhL8St2zMU3de6kKiuoQDkEPcVgu6wqEf7V2Zu3HYlewODbpM uThnIIRNJbXcBkfcTDpnHe2oVA1CKs0peuDxKJMuqSJ7NpMqk8nUDuFi2fVVqDFirxqo hANszDzUiOY+Bn1694328f8sXdydcFb0wNl55wI3dxxBjzty4DG7JptfyXLskwEfuzHs 3OAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9HnoT00GA/e4hqOrOsR5vOygtqQIU8ZliGrohbyJ7B8=; b=dtKaOBLzfNPddI93mF6xbo2ZcnLhjMnn5wv6/fVroGitUQ83+AL/VjVGrWV2LtWhkU un5ZtKBlxtnteMo++eYKJEJJilaLqf9qa/5ek4KXEKY2wht1pN1sBnXpx8qD7OdGUFEu AHYkuROXyiz7mXiyo355yhHIoTKReSDMkj2zjXgTp+a2xnDGYUPcV1iaSCvfhdp8IGqK wLs250xNKVK5GRYAnGFhEX8fsuovhHHqZYVO+hq/xjVUkDePVZi0JyNvo/1qjmAhXn2u Xt0KQxOyOkQhJezHkZFC78ZLqXcXdUv81fjxKz0EKNf2QYSNEJBDYrzeEXvhsHenzJAb RHvw== X-Gm-Message-State: APt69E0Ssf0Zrm19L8MLq4phnkCgkgElYkpyTlkOiMsNpvbnH/FbUyBt 3rIKc8CLpP2RQuy0ppmkQYY= X-Google-Smtp-Source: ADUXVKL6LZUBbmnzDgrGM7YA298sQpF7YdtJuBAjNkzHPxniGbc7LjoCfrzlCioXEVRNaKgKmmetEg== X-Received: by 2002:a62:40dc:: with SMTP id f89-v6mr15791018pfd.194.1528694190968; Sun, 10 Jun 2018 22:16:30 -0700 (PDT) Received: from localhost ([103.88.46.82]) by smtp.gmail.com with ESMTPSA id m9-v6sm108051463pff.41.2018.06.10.22.16.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Jun 2018 22:16:30 -0700 (PDT) From: Zhouyang Jia Cc: Zhouyang Jia , "James E.J. Bottomley" , "Martin K. Petersen" , Johannes Thumshirn , Hannes Reinecke , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] pcmcia: add error handling for pcmcia_enable_device Date: Mon, 11 Jun 2018 13:15:50 +0800 Message-Id: <1528694152-31724-1-git-send-email-jiazhouyang09@gmail.com> X-Mailer: git-send-email 2.7.4 To: unlisted-recipients:; (no To-header on input) Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/scsi/pcmcia/qlogic_stub.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index 0556054..9287d52 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c @@ -254,8 +254,14 @@ 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) { + pcmcia_disable_device(link); + return -ENODEV; + } - pcmcia_enable_device(link); if ((info->manf_id == MANFID_MACNICA) || (info->manf_id == MANFID_PIONEER) || (info->manf_id == 0x0098)) {