Merge tag '3.9-rc3-smp-6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabe...

[~andy/linux] / drivers / net / can / sja1000 / kvaser_pci.c

diff --git a/drivers/net/can/sja1000/kvaser_pci.c b/drivers/net/can/sja1000/kvaser_pci.c
index 37b0381f532e6458e13b7a424330047aec368e0c..217585b97cd3e0851439f8b388c040058b668100 100644 (file)
--- a/drivers/net/can/sja1000/kvaser_pci.c
+++ b/drivers/net/can/sja1000/kvaser_pci.c
@@ -159,9 +159,9 @@ static int number_of_sja1000_chip(void __iomem *base_addr)
        for (i = 0; i < MAX_NO_OF_CHANNELS; i++) {
                /* reset chip */
                iowrite8(MOD_RM, base_addr +
-                        (i * KVASER_PCI_PORT_BYTES) + REG_MOD);
+                        (i * KVASER_PCI_PORT_BYTES) + SJA1000_MOD);
                status = ioread8(base_addr +
-                                (i * KVASER_PCI_PORT_BYTES) + REG_MOD);
+                                (i * KVASER_PCI_PORT_BYTES) + SJA1000_MOD);
                /* check reset bit */
                if (!(status & MOD_RM))
                        break;