Fix NULL pointer dereference as reported by Chris Dore:

https://lists.berlios.de/pipermail/socketcan-core/2008-December/002120.html

Added missing initialisation of resource struct as reported by David Mueller:
https://lists.berlios.de/pipermail/socketcan-core/2008-December/002127.html

Signed-off-by: David Mueller <d.mueller@elsoft.ch>
Signed-off-by: Oliver Hartkopp <oliver@hartkopp.net>
git-svn-id: svn://svn.berlios.de//socketcan/trunk@879 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/drivers/net/can/sja1000/pipcan.c b/kernel/2.6/drivers/net/can/sja1000/pipcan.c
index 9b51c0a4ce8d00e49d2dcd3b19e13f10558e54f0..b7414b2186974d6b4ba3c41a6edcf7f5b6dc49e7 100644 (file)
--- a/kernel/2.6/drivers/net/can/sja1000/pipcan.c
+++ b/kernel/2.6/drivers/net/can/sja1000/pipcan.c
@@ -88,6 +88,7 @@ static int __init pc_probe(struct platform_device *pdev)
        dev->base_addr = res->start;
 
        dev_set_drvdata(&pdev->dev, dev);
+       SET_NETDEV_DEV(dev, &pdev->dev);
 
        /* deactivate RST */
        outb(inb(PIPCAN_RST) & ~0x01, PIPCAN_RST);
@@ -166,6 +167,7 @@ static int __init pc_init(void)
        }
 
        /* fill in resources */
+       memset(&r, 0, sizeof(r));
        r[0].start = addr;
        r[0].end = addr + PIPCAN_IOSIZE - 1;
        r[0].name = DRV_NAME;