Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afc13b76 authored by Hans Schillstrom's avatar Hans Schillstrom Committed by Jean Delvare
Browse files

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

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: default avatarHans Schillstrom <hans.schillstrom@shlsys.com>
Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent d4ce220d

drivers/i2c/busses/i2c-bfin-twi.c

+2 −1
Original line number Diff line number Diff line
@@ -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);