git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
[pandora-kernel.git]
/
drivers
/
staging
/
solo6x10
/
solo6010-i2c.c
diff --git
a/drivers/staging/solo6x10/solo6010-i2c.c
b/drivers/staging/solo6x10/solo6010-i2c.c
index
2bb86fa
..
cadd512
100644
(file)
--- a/
drivers/staging/solo6x10/solo6010-i2c.c
+++ b/
drivers/staging/solo6x10/solo6010-i2c.c
@@
-284,7
+284,7
@@
int solo_i2c_init(struct solo6010_dev *solo_dev)
solo_dev->i2c_id = -1;
solo_dev->i2c_state = IIC_STATE_IDLE;
init_waitqueue_head(&solo_dev->i2c_wait);
solo_dev->i2c_id = -1;
solo_dev->i2c_state = IIC_STATE_IDLE;
init_waitqueue_head(&solo_dev->i2c_wait);
-
init_MUTEX(&solo_dev->i2c_sem
);
+
sema_init(&solo_dev->i2c_sem, 1
);
for (i = 0; i < SOLO_I2C_ADAPTERS; i++) {
struct i2c_adapter *adap = &solo_dev->i2c_adap[i];
for (i = 0; i < SOLO_I2C_ADAPTERS; i++) {
struct i2c_adapter *adap = &solo_dev->i2c_adap[i];