diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/can/ti_hecc.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/can/ti_hecc.c')
| -rw-r--r-- | drivers/net/can/ti_hecc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c index 4d07f1ee7168..f7bbde9eb2cb 100644 --- a/drivers/net/can/ti_hecc.c +++ b/drivers/net/can/ti_hecc.c | |||
| @@ -663,7 +663,7 @@ static int ti_hecc_error(struct net_device *ndev, int int_status, | |||
| 663 | struct can_frame *cf; | 663 | struct can_frame *cf; |
| 664 | struct sk_buff *skb; | 664 | struct sk_buff *skb; |
| 665 | 665 | ||
| 666 | /* propogate the error condition to the can stack */ | 666 | /* propagate the error condition to the can stack */ |
| 667 | skb = alloc_can_err_skb(ndev, &cf); | 667 | skb = alloc_can_err_skb(ndev, &cf); |
| 668 | if (!skb) { | 668 | if (!skb) { |
| 669 | if (printk_ratelimit()) | 669 | if (printk_ratelimit()) |