aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2012-05-18 15:46:30 +0000
committerHauke Mehrtens <hauke@openwrt.org>2012-05-18 15:46:30 +0000
commit1dd74eea6bf236fac46ba9949e75214763ddd03f (patch)
treeb757e9734db2dd69d3d7ee69e0b5b86ccebc3998 /target/linux
parent972c918b16485c20dee1581fc5eb7e630acd6222 (diff)
downloadupstream-1dd74eea6bf236fac46ba9949e75214763ddd03f.tar.gz
upstream-1dd74eea6bf236fac46ba9949e75214763ddd03f.tar.bz2
upstream-1dd74eea6bf236fac46ba9949e75214763ddd03f.zip
brcm47xx: bcma: fix null pointer
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm47xx/patches-3.3/233-bcma-fix-NP-in-bcma_core_pci_irq_ctl.patch20
1 files changed, 20 insertions, 0 deletions
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;