aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/pch_can.c2
-rw-r--r--drivers/net/can/softing/softing_main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index e54712b22c2..d11fbb2b95f 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -653,7 +653,7 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota)
653 u16 data_reg; 653 u16 data_reg;
654 654
655 do { 655 do {
656 /* Reading the messsage object from the Message RAM */ 656 /* Reading the message object from the Message RAM */
657 iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask); 657 iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
658 pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, obj_num); 658 pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, obj_num);
659 659
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index 7a70709d560..60a49e5a2a5 100644
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -797,7 +797,7 @@ static __devinit int softing_pdev_probe(struct platform_device *pdev)
797 ret = -EINVAL; 797 ret = -EINVAL;
798 pres = platform_get_resource(pdev, IORESOURCE_MEM, 0); 798 pres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
799 if (!pres) 799 if (!pres)
800 goto platform_resource_failed;; 800 goto platform_resource_failed;
801 card->dpram_phys = pres->start; 801 card->dpram_phys = pres->start;
802 card->dpram_size = pres->end - pres->start + 1; 802 card->dpram_size = pres->end - pres->start + 1;
803 card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size); 803 card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size);