diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:20:28 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:20:28 -0600 |
| commit | 026c683cbeada150ccb606120f8899a9c1a6dfba (patch) | |
| tree | 9f1db346d6e1af92b9dc6aee166d11c98801a184 /drivers/i2c | |
| parent | e86b51790bec5f1151508c11a87444669586b698 (diff) | |
CR SDCaa01608: I2C uses wrong adapter name
Patch for CR SDCaa01608: I2C uses wrong adapter name.
In the mxc_i2c driver, set the adapter name to be the same as the
platform_device name. Otherwise, drivers that use i2c may fail
when checking the mxc_i2c adapter name, such as the USB driver.
Applies to linux 2.6.22 kernel on MX platforms.
http://www.bitshrine.org/gpp/linux-2.6.22-mx-CR-SDCaa01608-I2C-uses-wrong-adapter-name.patch
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/mxc_i2c.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/mxc_i2c.c b/drivers/i2c/busses/mxc_i2c.c index 4d8398d1c6b6..ea9fc2909b09 100644 --- a/drivers/i2c/busses/mxc_i2c.c +++ b/drivers/i2c/busses/mxc_i2c.c @@ -33,6 +33,7 @@ #include <linux/clk.h> #include <asm/irq.h> #include <asm/io.h> +#include <asm/arch/mxc_i2c.h> #include "mxc_i2c_reg.h" /*! @@ -692,7 +693,7 @@ static int mxci2c_probe(struct platform_device *pdev) /* * Set the adapter information */ - strcpy(mxc_i2c->adap.name, pdev->name); + strcpy(mxc_i2c->adap.name, MXC_ADAPTER_NAME); mxc_i2c->adap.id = id; mxc_i2c->adap.algo = &mxc_i2c_algorithm; mxc_i2c->adap.timeout = 1; |