From patchwork Tue Jun 12 04:14:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhouyang Jia X-Patchwork-Id: 10459217 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 1238B60348 for ; Tue, 12 Jun 2018 04:14:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 030B628617 for ; Tue, 12 Jun 2018 04:14:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB03D2863B; Tue, 12 Jun 2018 04:14:31 +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 B1D9928617 for ; Tue, 12 Jun 2018 04:14:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752004AbeFLEOR (ORCPT ); Tue, 12 Jun 2018 00:14:17 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35396 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750811AbeFLEOQ (ORCPT ); Tue, 12 Jun 2018 00:14:16 -0400 Received: by mail-pg0-f67.google.com with SMTP id 15-v6so10813619pge.2; Mon, 11 Jun 2018 21:14:16 -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=53jmd6VBTwCu1hs5bt0XrHUyKAV/JcKLjrCANFnXVRk=; b=ks81H3PdQ/Mrsz2jHqxTgFeBZhxCJ2RraeVFFoLinfbHhWKABLyvaywnoZs0GCb3AZ C50oyFI6h2anyxEHJWtdJ9p9j5pea4/ZXcHw80oXQHHjXN62xrLMiipLxH6kZqg+57pc TlcqQU1Wkmxwr3x5Kq/pZXaBlHn7Wby+tkgMbpCeMoNuz/NC5o+k5lfOHaw60GSuhqoL lxha5+PU1U+xDw43ARA5Eb8QRCunnwfBz7Gb+pM5ZXgIaUlofaVz1zhACy74gsDFHxJq SgA2IADrgCziVUIJ0u6pJRHZJGMMITkLuDcQNmffLSY6y9ggl+H1ZgRvM+7Xn75dSmIk 71fg== 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=53jmd6VBTwCu1hs5bt0XrHUyKAV/JcKLjrCANFnXVRk=; b=YFPmwu1CRnFvb32LPcjtMKx6kSJ1LpZ1Pltk7jNpByF9viArli3YdHY5Evf5SQ3gBF cYWZqoeOWRjMoqxpTJzCax8vflYEcKQK6KO+/nX2pXU2zgVabELUdw4KBfCtLQIgBgBz mhru4Dgo6scfORqWi7cM6SqlAoUxmvIuyOvw1EMCh4dH0B5yvzqHdaw67kYHcOI/sIa3 YdG2dhW49cDZwbq6+2hhPkkWHZbZymCdtnHmDoCHKIPpfo24+U5MhtLrzX3+8m+jakrF qGULhnVZNkVJzqYz+KkwypMBb7tck6pRQjetXSY+bUyuO0lxWraCp1RZAUARsO/4DGVL ZRbQ== X-Gm-Message-State: APt69E3IqF5Ryb98cPw75lJJrdYU5k15AadpryVtnTB19uKuJbTmNPHt T7w5NguVdANb4pALSDKndLs= X-Google-Smtp-Source: ADUXVKL7T0wVUe4odCbQoDTaFLKO6bXWbPUQ96RgmLrS2jeCcU4t7kUiaJvG1ZnyVBwACn6TuyOMnQ== X-Received: by 2002:a62:9e0b:: with SMTP id s11-v6mr2080021pfd.198.1528776856378; Mon, 11 Jun 2018 21:14:16 -0700 (PDT) Received: from localhost ([103.88.46.82]) by smtp.gmail.com with ESMTPSA id a11-v6sm103309418pgn.64.2018.06.11.21.14.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Jun 2018 21:14:15 -0700 (PDT) From: Zhouyang Jia Cc: Zhouyang Jia , Bradley Grove , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: esas2r: add error handling for pci_enable_device Date: Tue, 12 Jun 2018 12:14:09 +0800 Message-Id: <1528776850-39672-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 pci_enable_device fails, the lack of error-handling code may cause unexpected results. This patch adds error-handling code after calling pci_enable_device. Signed-off-by: Zhouyang Jia --- drivers/scsi/esas2r/esas2r_init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/scsi/esas2r/esas2r_init.c b/drivers/scsi/esas2r/esas2r_init.c index 9dffcb2..364538c 100644 --- a/drivers/scsi/esas2r/esas2r_init.c +++ b/drivers/scsi/esas2r/esas2r_init.c @@ -707,6 +707,9 @@ int esas2r_resume(struct pci_dev *pdev) esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev), "pci_enable_device() called"); rez = pci_enable_device(pdev); + if (rez) + goto error_exit; + pci_set_master(pdev); if (!a) {