diff options
author | Andreas Schwab <schwab@linux-m68k.org> | 2010-06-01 01:58:40 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-06-02 03:50:36 -0400 |
commit | 83aea945c21c646184a494a32ad5524248b60226 (patch) | |
tree | c28239664bd321eb72da62d39b9ecf2d467e87b5 /drivers | |
parent | aef4b9aaae1decc775778903922bd0075cce7a88 (diff) |
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')
-rw-r--r-- | drivers/macintosh/macio_asic.c | 7 |
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) | |||
492 | } | 492 | } |
493 | 493 | ||
494 | /* Add media bay devices if any */ | 494 | /* Add media bay devices if any */ |
495 | pnode = mbdev->ofdev.dev.of_node; | 495 | if (mbdev) { |
496 | if (mbdev) | 496 | pnode = mbdev->ofdev.dev.of_node; |
497 | for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) { | 497 | for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) { |
498 | if (macio_skip_device(np)) | 498 | if (macio_skip_device(np)) |
499 | continue; | 499 | continue; |
@@ -502,10 +502,11 @@ static void macio_pci_add_devices(struct macio_chip *chip) | |||
502 | mbdev, root_res) == NULL) | 502 | mbdev, root_res) == NULL) |
503 | of_node_put(np); | 503 | of_node_put(np); |
504 | } | 504 | } |
505 | } | ||
505 | 506 | ||
506 | /* Add serial ports if any */ | 507 | /* Add serial ports if any */ |
507 | pnode = sdev->ofdev.dev.of_node; | ||
508 | if (sdev) { | 508 | if (sdev) { |
509 | pnode = sdev->ofdev.dev.of_node; | ||
509 | for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) { | 510 | for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) { |
510 | if (macio_skip_device(np)) | 511 | if (macio_skip_device(np)) |
511 | continue; | 512 | continue; |