aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/janz-ican3.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-01-30 19:48:17 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-30 19:48:17 -0500
commit65b80cae7a72e94df9335552e1a77a3a8946566c (patch)
tree28617224603f1e162a2cb6014c1dd3cc027c251a /drivers/net/can/janz-ican3.c
parent2b6e0ca175fe4a20f21ba82b1e7ccc71029c4dd4 (diff)
parent73615c8669ef1c497c942cae0d5079b95824332a (diff)
Merge tag 'linux-can-fixes-for-3.14-20140129' of git://gitorious.org/linux-can/linux-can
linux-can-fixes-for-3.14-20140129 Marc Kleine-Budde says: ==================== Arnd Bergmann provides a fix for the flexcan driver, enabling compilation on all combinations of big and little endian on ARM and PowerPc. A patch by Ira W. Snyder fixes uninitialized variable warnings in the janz-ican3 driver. Rostislav Lisovy contributes a patch to propagate the SO_PRIORITY of raw sockets to skbs. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/janz-ican3.c')
-rw-r--r--drivers/net/can/janz-ican3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index 2124c6790687..71594e5676fd 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -1312,7 +1312,7 @@ static int ican3_napi(struct napi_struct *napi, int budget)
1312 1312
1313 /* process all communication messages */ 1313 /* process all communication messages */
1314 while (true) { 1314 while (true) {
1315 struct ican3_msg msg; 1315 struct ican3_msg uninitialized_var(msg);
1316 ret = ican3_recv_msg(mod, &msg); 1316 ret = ican3_recv_msg(mod, &msg);
1317 if (ret) 1317 if (ret)
1318 break; 1318 break;