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

Commit 5672bc81 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  of/i2c: Fix module load order issue caused by of_i2c.c
  i2c: Fix checks which cause legacy suspend to never get called
  i2c-pca: Fix waitforcompletion() return value
  i2c: Fix for suspend/resume issue
  i2c: Remove obsolete cleanup for clientdata
parents 27b3d80a 925bb9c6

drivers/i2c/busses/i2c-cpm.c

+5 −0
Original line number Diff line number Diff line
@@ -677,6 +677,11 @@ static int __devinit cpm_i2c_probe(struct platform_device *ofdev, 
	dev_dbg(&ofdev->dev, "hw routines for %s registered.\n",

		cpm->adap.name);



	/*

	 * register OF I2C devices

	 */

	of_i2c_register_devices(&cpm->adap);



	return 0;

out_shut:

	cpm_i2c_shutdown(cpm);

drivers/i2c/busses/i2c-ibm_iic.c

+3 −0
Original line number Diff line number Diff line
@@ -761,6 +761,9 @@ static int __devinit iic_probe(struct platform_device *ofdev, 
	dev_info(&ofdev->dev, "using %s mode\n",

		 dev->fast_mode ? "fast (400 kHz)" : "standard (100 kHz)");



	/* Now register all the child nodes */

	of_i2c_register_devices(adap);



	return 0;



error_cleanup:

drivers/i2c/busses/i2c-mpc.c

+1 −0
Original line number Diff line number Diff line
@@ -632,6 +632,7 @@ static int __devinit fsl_i2c_probe(struct platform_device *op, 
		dev_err(i2c->dev, "failed to add adapter\n");

		goto fail_add;

	}

	of_i2c_register_devices(&i2c->adap);



	return result;

drivers/i2c/busses/i2c-pca-isa.c

+8 −4
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ static int pca_isa_readbyte(void *pd, int reg) 


static int pca_isa_waitforcompletion(void *pd)

{

	long ret = ~0;

	unsigned long timeout;

	long ret;



	if (irq > -1) {

		ret = wait_event_timeout(pca_wait,
@@ -81,11 +81,15 @@ static int pca_isa_waitforcompletion(void *pd) 
	} else {

		/* Do polling */

		timeout = jiffies + pca_isa_ops.timeout;

		while (((pca_isa_readbyte(pd, I2C_PCA_CON)

				& I2C_PCA_CON_SI) == 0)

				&& (ret = time_before(jiffies, timeout)))

		do {

			ret = time_before(jiffies, timeout);

			if (pca_isa_readbyte(pd, I2C_PCA_CON)

					& I2C_PCA_CON_SI)

				break;

			udelay(100);

		} while (ret);

	}



	return ret > 0;

}

drivers/i2c/busses/i2c-pca-platform.c

+7 −4
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ static void i2c_pca_pf_writebyte32(void *pd, int reg, int val) 
static int i2c_pca_pf_waitforcompletion(void *pd)

{

	struct i2c_pca_pf_data *i2c = pd;

	long ret = ~0;

	unsigned long timeout;

	long ret;



	if (i2c->irq) {

		ret = wait_event_timeout(i2c->wait,
@@ -90,10 +90,13 @@ static int i2c_pca_pf_waitforcompletion(void *pd) 
	} else {

		/* Do polling */

		timeout = jiffies + i2c->adap.timeout;

		while (((i2c->algo_data.read_byte(i2c, I2C_PCA_CON)

				& I2C_PCA_CON_SI) == 0)

				&& (ret = time_before(jiffies, timeout)))

		do {

			ret = time_before(jiffies, timeout);

			if (i2c->algo_data.read_byte(i2c, I2C_PCA_CON)

					& I2C_PCA_CON_SI)

				break;

			udelay(100);

		} while (ret);

	}



	return ret > 0;