From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Fri, 18 May 2012 15:46:30 +0000 (+0000)
Subject: brcm47xx: bcma: fix null pointer
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7ad663dda6ca231f8eee85ef07c7294728242f59;p=openwrt%2Fstaging%2Fstintel.git

brcm47xx: bcma: fix null pointer

SVN-Revision: 31789
---

diff --git a/target/linux/brcm47xx/patches-3.3/233-bcma-fix-NP-in-bcma_core_pci_irq_ctl.patch b/target/linux/brcm47xx/patches-3.3/233-bcma-fix-NP-in-bcma_core_pci_irq_ctl.patch
new file mode 100644
index 0000000000..9843f973a8
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.3/233-bcma-fix-NP-in-bcma_core_pci_irq_ctl.patch
@@ -0,0 +1,20 @@
+--- a/drivers/bcma/driver_pci.c
++++ b/drivers/bcma/driver_pci.c
+@@ -232,7 +232,7 @@ void __devinit bcma_core_pci_init(struct
+ int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,
+ 			  bool enable)
+ {
+-	struct pci_dev *pdev = pc->core->bus->host_pci;
++	struct pci_dev *pdev;
+ 	u32 coremask, tmp;
+ 	int err = 0;
+ 
+@@ -243,6 +243,8 @@ int bcma_core_pci_irq_ctl(struct bcma_dr
+ 		goto out;
+ 	}
+ 
++	pdev = pc->core->bus->host_pci;
++
+ 	err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);
+ 	if (err)
+ 		goto out;