aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-05 14:11:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-05 14:11:59 -0400
commit283dbd82055eb70ff3b469f812d9c695f18c9641 (patch)
tree0a97e7b60b79bc48de9276c4da0f9472a202b130 /drivers/net/can
parent11126c611e10abb18b6f1ed0300c0548c3906b54 (diff)
parent6825a26c2dc21eb4f8df9c06d3786ddec97cf53b (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking changes from David Miller: "The most important bit in here is the fix for input route caching from Eric Dumazet, it's a shame we couldn't fully analyze this in time for 3.6 as it's a 3.6 regression introduced by the routing cache removal. Anyways, will send quickly to -stable after you pull this in. Other changes of note: 1) Fix lockdep splats in team and bonding, from Eric Dumazet. 2) IPV6 adds link local route even when there is no link local address, from Nicolas Dichtel. 3) Fix ixgbe PTP implementation, from Jacob Keller. 4) Fix excessive stack usage in cxgb4 driver, from Vipul Pandya. 5) MAC length computed improperly in VLAN demux, from Antonio Quartulli." * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits) ipv6: release reference of ip6_null_entry's dst entry in __ip6_del_rt Remove noisy printks from llcp_sock_connect tipc: prevent dropped connections due to rcvbuf overflow silence some noisy printks in irda team: set qdisc_tx_busylock to avoid LOCKDEP splat bonding: set qdisc_tx_busylock to avoid LOCKDEP splat sctp: check src addr when processing SACK to update transport state sctp: fix a typo in prototype of __sctp_rcv_lookup() ipv4: add a fib_type to fib_info can: mpc5xxx_can: fix section type conflict can: peak_pcmcia: fix error return code can: peak_pci: fix error return code cxgb4: Fix build error due to missing linux/vmalloc.h include. bnx2x: fix ring size for 10G functions cxgb4: Dynamically allocate memory in t4_memory_rw() and get_vpd_params() ixgbe: add support for X540-AT1 ixgbe: fix poll loop for FDIRCTRL.INIT_DONE bit ixgbe: fix PTP ethtool timestamping function ixgbe: (PTP) Fix PPS interrupt code ixgbe: Fix PTP X540 SDP alignment code for PPS signal ...
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/mscan/mpc5xxx_can.c8
-rw-r--r--drivers/net/can/sja1000/peak_pci.c2
-rw-r--r--drivers/net/can/sja1000/peak_pcmcia.c4
3 files changed, 9 insertions, 5 deletions
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index c975999bb055..799c354083c4 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -247,7 +247,7 @@ static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev,
247} 247}
248#endif /* CONFIG_PPC_MPC512x */ 248#endif /* CONFIG_PPC_MPC512x */
249 249
250static struct of_device_id mpc5xxx_can_table[]; 250static const struct of_device_id mpc5xxx_can_table[];
251static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev) 251static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev)
252{ 252{
253 const struct of_device_id *match; 253 const struct of_device_id *match;
@@ -380,17 +380,17 @@ static int mpc5xxx_can_resume(struct platform_device *ofdev)
380} 380}
381#endif 381#endif
382 382
383static const struct mpc5xxx_can_data __devinitdata mpc5200_can_data = { 383static const struct mpc5xxx_can_data __devinitconst mpc5200_can_data = {
384 .type = MSCAN_TYPE_MPC5200, 384 .type = MSCAN_TYPE_MPC5200,
385 .get_clock = mpc52xx_can_get_clock, 385 .get_clock = mpc52xx_can_get_clock,
386}; 386};
387 387
388static const struct mpc5xxx_can_data __devinitdata mpc5121_can_data = { 388static const struct mpc5xxx_can_data __devinitconst mpc5121_can_data = {
389 .type = MSCAN_TYPE_MPC5121, 389 .type = MSCAN_TYPE_MPC5121,
390 .get_clock = mpc512x_can_get_clock, 390 .get_clock = mpc512x_can_get_clock,
391}; 391};
392 392
393static struct of_device_id __devinitdata mpc5xxx_can_table[] = { 393static const struct of_device_id __devinitconst mpc5xxx_can_table[] = {
394 { .compatible = "fsl,mpc5200-mscan", .data = &mpc5200_can_data, }, 394 { .compatible = "fsl,mpc5200-mscan", .data = &mpc5200_can_data, },
395 /* Note that only MPC5121 Rev. 2 (and later) is supported */ 395 /* Note that only MPC5121 Rev. 2 (and later) is supported */
396 { .compatible = "fsl,mpc5121-mscan", .data = &mpc5121_can_data, }, 396 { .compatible = "fsl,mpc5121-mscan", .data = &mpc5121_can_data, },
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
index f0a12962f7b6..f5b82aeb2540 100644
--- a/drivers/net/can/sja1000/peak_pci.c
+++ b/drivers/net/can/sja1000/peak_pci.c
@@ -583,12 +583,14 @@ static int __devinit peak_pci_probe(struct pci_dev *pdev,
583 cfg_base = pci_iomap(pdev, 0, PEAK_PCI_CFG_SIZE); 583 cfg_base = pci_iomap(pdev, 0, PEAK_PCI_CFG_SIZE);
584 if (!cfg_base) { 584 if (!cfg_base) {
585 dev_err(&pdev->dev, "failed to map PCI resource #0\n"); 585 dev_err(&pdev->dev, "failed to map PCI resource #0\n");
586 err = -ENOMEM;
586 goto failure_release_regions; 587 goto failure_release_regions;
587 } 588 }
588 589
589 reg_base = pci_iomap(pdev, 1, PEAK_PCI_CHAN_SIZE * channels); 590 reg_base = pci_iomap(pdev, 1, PEAK_PCI_CHAN_SIZE * channels);
590 if (!reg_base) { 591 if (!reg_base) {
591 dev_err(&pdev->dev, "failed to map PCI resource #1\n"); 592 dev_err(&pdev->dev, "failed to map PCI resource #1\n");
593 err = -ENOMEM;
592 goto failure_unmap_cfg_base; 594 goto failure_unmap_cfg_base;
593 } 595 }
594 596
diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
index ec6bd9d1b2af..272a85f32b14 100644
--- a/drivers/net/can/sja1000/peak_pcmcia.c
+++ b/drivers/net/can/sja1000/peak_pcmcia.c
@@ -686,8 +686,10 @@ static int __devinit pcan_probe(struct pcmcia_device *pdev)
686 686
687 /* detect available channels */ 687 /* detect available channels */
688 pcan_add_channels(card); 688 pcan_add_channels(card);
689 if (!card->chan_count) 689 if (!card->chan_count) {
690 err = -ENOMEM;
690 goto probe_err_4; 691 goto probe_err_4;
692 }
691 693
692 /* init the timer which controls the leds */ 694 /* init the timer which controls the leds */
693 init_timer(&card->led_timer); 695 init_timer(&card->led_timer);