diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:23:05 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:23:05 -0600 |
| commit | 8107be36feab15e2929aa4a855695c0d69e6cedb (patch) | |
| tree | b877d67971d88d9c4ec0459055fe9d0a271333bd | |
| parent | 53e15cdeac0e28c0ca41efc3a27ba8e6c8dc8a7f (diff) | |
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.
http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-fix_i2c_adapter_name.patch
| -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 4902fd733265..8b5e4df2d969 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; |