From patchwork Sat Nov 19 08:32:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashok Raj X-Patchwork-Id: 9437937 X-Patchwork-Delegate: bhelgaas@google.com 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 C384360755 for ; Sat, 19 Nov 2016 08:33:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4BC62990F for ; Sat, 19 Nov 2016 08:33:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D03129975; Sat, 19 Nov 2016 08:33:17 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham 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 3B9142990F for ; Sat, 19 Nov 2016 08:33:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752959AbcKSIdM (ORCPT ); Sat, 19 Nov 2016 03:33:12 -0500 Received: from mga06.intel.com ([134.134.136.31]:24921 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752342AbcKSIcx (ORCPT ); Sat, 19 Nov 2016 03:32:53 -0500 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP; 19 Nov 2016 00:32:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,662,1473145200"; d="scan'208";a="33236247" Received: from otc-nc-03.jf.intel.com ([10.54.39.141]) by fmsmga006.fm.intel.com with ESMTP; 19 Nov 2016 00:32:51 -0800 From: Ashok Raj To: linux-pci@vger.kernel.org, Bjorn Helgaas Cc: Ashok Raj , Keith Busch , linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 2/3] pciehp: Fix led status when enabling already enabled slot. Date: Sat, 19 Nov 2016 00:32:46 -0800 Message-Id: <1479544367-7195-3-git-send-email-ashok.raj@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479544367-7195-1-git-send-email-ashok.raj@intel.com> References: <1479544367-7195-1-git-send-email-ashok.raj@intel.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If an error occurs enabling a slot on a hot plug event, the presence LED is disabled. It is not an error, though, when the slot was already enabled. This patch returns success if called to enable an already enabled slot. This is in the same spirit of the special handling for EEXISTS when pciehp_configure_device determines the slot devices already exist. Cc: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org Signed-off-by: Ashok Raj Reviewed-by: Keith Busch --- drivers/pci/hotplug/pciehp_ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index efe69e8..ec0b4c1 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c @@ -410,7 +410,7 @@ int pciehp_enable_slot(struct slot *p_slot) if (getstatus) { ctrl_info(ctrl, "Slot(%s): Already enabled\n", slot_name(p_slot)); - return -EINVAL; + return 0; } }