summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2010-06-01 05:58:40 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-06-02 17:50:36 +1000
commit83aea945c21c646184a494a32ad5524248b60226 (patch)
treec28239664bd321eb72da62d39b9ecf2d467e87b5 /drivers/macintosh
parentaef4b9aaae1decc775778903922bd0075cce7a88 (diff)
downloadlinux-83aea945c21c646184a494a32ad5524248b60226.tar.gz
linux-83aea945c21c646184a494a32ad5524248b60226.tar.bz2
linux-83aea945c21c646184a494a32ad5524248b60226.zip
powerpc/macio: Don't dereference pointer before null check
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r--drivers/macintosh/macio_asic.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 97147804a49c..40390ac01309 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -492,8 +492,8 @@ static void macio_pci_add_devices(struct macio_chip *chip)
}
/* Add media bay devices if any */
- pnode = mbdev->ofdev.dev.of_node;
- if (mbdev)
+ if (mbdev) {
+ pnode = mbdev->ofdev.dev.of_node;
for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) {
if (macio_skip_device(np))
continue;
@@ -502,10 +502,11 @@ static void macio_pci_add_devices(struct macio_chip *chip)
mbdev, root_res) == NULL)
of_node_put(np);
}
+ }
/* Add serial ports if any */
- pnode = sdev->ofdev.dev.of_node;
if (sdev) {
+ pnode = sdev->ofdev.dev.of_node;
for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) {
if (macio_skip_device(np))
continue;