---

yaml --- r: 44340 b: refs/heads/master c: 6ea2303 h: refs/heads/master v: v3
git-mirror · Dec 10, 2006 · 7053902 · 7053902
1 parent 60fe795
commit 7053902
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad04d5c3879dcf79ba0fa1826eab991f7b7a2de8
+refs/heads/master: 6ea23039cb1cc7c379eb5fba0ed2c53291e9bea7
diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c
@@ -603,7 +603,7 @@ int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs, int num)
 		}
 #endif
 
-		mutex_lock(&adap->bus_lock);
+		mutex_lock_nested(&adap->bus_lock, adap->level);
 		ret = adap->algo->master_xfer(adap,msgs,num);
 		mutex_unlock(&adap->bus_lock);
 

diff --git a/trunk/include/linux/i2c.h b/trunk/include/linux/i2c.h
@@ -216,6 +216,7 @@ struct i2c_adapter {
 	int (*client_unregister)(struct i2c_client *);
 
 	/* data fields that are valid for all devices	*/
+	u8 level; 			/* nesting level for lockdep */
 	struct mutex bus_lock;
 	struct mutex clist_lock;