From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date: Mon, 2 Jun 2008 16:22:34 +0000 (-0700)
Subject: pciehp: removes redundant NULL write to slot status register
X-Git-Tag: MMI-PSA29.97-13-9~33634^2~45
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6a3f084971bad985722afe25b16a5c0a990cea75;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

pciehp: removes redundant NULL write to slot status register

Cleanup to remove a redundant NULL write to SLOTSTATUS.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---

diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index eeb517b1b63d..0cfaedf2edca 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -777,7 +777,7 @@ static irqreturn_t pcie_isr(int irq, void *dev_id)
 		intr_loc |= detected;
 		if (!intr_loc)
 			return IRQ_NONE;
-		if (pciehp_writew(ctrl, SLOTSTATUS, detected)) {
+		if (detected && pciehp_writew(ctrl, SLOTSTATUS, detected)) {
 			err("%s: Cannot write to SLOTSTATUS\n", __func__);
 			return IRQ_NONE;
 		}