From 8315e03b0f9464bc90354ec55da2c864436a22d3 Mon Sep 17 00:00:00 2001
From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: Wed, 19 May 2010 06:46:38 +0000
Subject: [PATCH] --- yaml --- r: 198569 b: refs/heads/master c:
 1f01bfd202bc539bccd282befa2bbdb8d6ad80ee h: refs/heads/master i:   198567:
 5ddfc93ce27826aec273c008f245992e61fcdc75 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/can/sja1000/sja1000.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6ca57b936700..a8158818fc21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f0b405cd16f7aaff84a935984cae421897d725d
+refs/heads/master: 1f01bfd202bc539bccd282befa2bbdb8d6ad80ee
diff --git a/trunk/drivers/net/can/sja1000/sja1000.c b/trunk/drivers/net/can/sja1000/sja1000.c
index 85f7cbfe8e5f..0a8de01d52f7 100644
--- a/trunk/drivers/net/can/sja1000/sja1000.c
+++ b/trunk/drivers/net/can/sja1000/sja1000.c
@@ -599,6 +599,8 @@ struct net_device *alloc_sja1000dev(int sizeof_priv)
 	priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |
 		CAN_CTRLMODE_BERR_REPORTING;
 
+	spin_lock_init(&priv->cmdreg_lock);
+
 	if (sizeof_priv)
 		priv->priv = (void *)priv + sizeof(struct sja1000_priv);