korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 09:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

i2c-bfin-twi: Fix mismatch in add timer and delete timer

Browse Source 
Move init_completion to just before i2c transfer.
http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3385

Signed-off-by: Hans Schillstrom <hans.schillstrom@shlsys.com>
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
Hans Schillstrom 2008-04-22 22:16:48 +02:00 committed by Jean Delvare
parent d4ce220d49
commit afc13b765e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/i2c/busses/i2c-bfin-twi.c
View File

@ -308,6 +308,7 @@ static int bfin_twi_master_xfer(struct i2c_adapter *adap,
iface->writeNum = iface->readNum = pmsg->len;
iface->result = 0;
iface->timeout_count = 10;
init_completion(&(iface->complete));
/* Set Transmit device address */
write_MASTER_ADDR(iface, pmsg->addr);
@ -447,6 +448,7 @@ int bfin_twi_smbus_xfer(struct i2c_adapter *adap, u16 addr,
iface->read_write = read_write;
iface->command = command;
iface->timeout_count = 10;
init_completion(&(iface->complete));
/* FIFO Initiation. Data in FIFO should be discarded before
* start a new operation.
@ -608,7 +610,6 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
}
spin_lock_init(&(iface->lock));
init_completion(&(iface->complete));
/* Find and map our resources */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);