aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Song <barry.song@analog.com>2010-03-08 15:13:57 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-01 19:01:22 -0400
commitc2b2df61e78aa5570473e2d46db6d88f5071b520 (patch)
treedf89d3e9455d3906388249dd90b42257ac572272
parent095a7d07b8e852ba8bbcd1f3f6c056819fed5d29 (diff)
can: fix bfin_can build error after alloc_candev() change
commit e9dcd1613f0ac0b3573b7d813a2c5672cd8302eb upstream. Looks like commit a6e4bc530403 didn't include updates to drivers so the Blackfin CAN driver fails to build now. Signed-off-by: Barry Song <barry.song@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Wolfgang Grandegger <wg@grandegger.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/net/can/bfin_can.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
index 0ec1524523cc..fe5e32000a45 100644
--- a/drivers/net/can/bfin_can.c
+++ b/drivers/net/can/bfin_can.c
@@ -26,6 +26,7 @@
26 26
27#define DRV_NAME "bfin_can" 27#define DRV_NAME "bfin_can"
28#define BFIN_CAN_TIMEOUT 100 28#define BFIN_CAN_TIMEOUT 100
29#define TX_ECHO_SKB_MAX 1
29 30
30/* 31/*
31 * transmit and receive channels 32 * transmit and receive channels
@@ -590,7 +591,7 @@ struct net_device *alloc_bfin_candev(void)
590 struct net_device *dev; 591 struct net_device *dev;
591 struct bfin_can_priv *priv; 592 struct bfin_can_priv *priv;
592 593
593 dev = alloc_candev(sizeof(*priv)); 594 dev = alloc_candev(sizeof(*priv), TX_ECHO_SKB_MAX);
594 if (!dev) 595 if (!dev)
595 return NULL; 596 return NULL;
596 597