diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-24 16:09:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-24 16:09:34 -0400 |
| commit | cc7feea39bed2951cc29af3ad642f39a99dfe8d3 (patch) | |
| tree | d11b9f40044951128c9151b0fd88c13066dfec31 /drivers/net | |
| parent | 6f58d79598c184dc4f18ceddfaa5fa7483bce0a5 (diff) | |
| parent | 7ea6fd7e2df041297298b5feb5b7b78a2b1a5310 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix Oops with TQM5200 on TQM5200
[POWERPC] mpc5200: Fix null dereference if bestcomm fails to initialize
[POWERPC] mpc5200-fec: Fix possible NULL dereference in mdio driver
[POWERPC] Fix crash in init_ipic_sysfs on efika
[POWERPC] Don't use 64k pages for ioremap on pSeries
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fec_mpc52xx_phy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c index 1837584c4504..6a3ac4ea97e9 100644 --- a/drivers/net/fec_mpc52xx_phy.c +++ b/drivers/net/fec_mpc52xx_phy.c | |||
| @@ -109,7 +109,8 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_i | |||
| 109 | int irq = irq_of_parse_and_map(child, 0); | 109 | int irq = irq_of_parse_and_map(child, 0); |
| 110 | if (irq != NO_IRQ) { | 110 | if (irq != NO_IRQ) { |
| 111 | const u32 *id = of_get_property(child, "reg", NULL); | 111 | const u32 *id = of_get_property(child, "reg", NULL); |
| 112 | bus->irq[*id] = irq; | 112 | if (id) |
| 113 | bus->irq[*id] = irq; | ||
| 113 | } | 114 | } |
| 114 | } | 115 | } |
| 115 | 116 | ||