Changeset 3795

Timestamp:

06/04/03 07:27:38 (10 years ago)

Author:

mmh

Message:

Fixed a deadlock in i2c_check_addr().
(mmh) The fix is harmonized to similar code in kernel 2.5.70.

Files:

• i2c/branches/lk2-4/kernel/i2c-core.c (modified) (1 diff)

i2c/branches/lk2-4/kernel/i2c-core.c

@@ -298 +298 @@
 }
 
-int i2c_check_addr (struct i2c_adapter *adapter, int addr)
+static int __i2c_check_addr (struct i2c_adapter *adapter, int addr)
 {
         int i;
-        down(&adapter->list);
         for (i = 0; i < I2C_CLIENT_MAX ; i++) 
                 if (adapter->clients[i] && (adapter->clients[i]->addr == addr))
                         return -EBUSY;
+
+        return 0;
+}
+
+int i2c_check_addr (struct i2c_adapter *adapter, int addr)
+{
+        int rval;
+
+        down(&adapter->list);
+        rval = __i2c_check_addr(adapter, addr);
         up(&adapter->list);
+
         return 0;
 }