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

Commit e2efb897 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Wolfram Sang
Browse files

i2c: cadence: fixup wait_for_completion_timeout return handling 



return type of wait_for_completion_timeout is unsigned long not int. The
return variable is renamed to make the timeout condition clearly readable
and the type adjusted to unsigned long.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent bd9dd73c

drivers/i2c/busses/i2c-cadence.c

+3 −3
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static void cdns_i2c_master_reset(struct i2c_adapter *adap) 
static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg,

		struct i2c_adapter *adap)

{

	int ret;

	unsigned long time_left;

	u32 reg;



	id->p_msg = msg;
@@ -501,8 +501,8 @@ static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg, 
		cdns_i2c_msend(id);



	/* Wait for the signal of completion */

	ret = wait_for_completion_timeout(&id->xfer_done, adap->timeout);

	if (!ret) {

	time_left = wait_for_completion_timeout(&id->xfer_done, adap->timeout);

	if (time_left == 0) {

		cdns_i2c_master_reset(adap);

		dev_err(id->adap.dev.parent,

				"timeout waiting on completion\n");