diff options
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 14e83d0aac8c..11c7477a0ffa 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
@@ -839,9 +839,7 @@ static int i2c_pxa_probe(struct platform_device *dev) | |||
839 | { | 839 | { |
840 | struct pxa_i2c *i2c = &i2c_pxa; | 840 | struct pxa_i2c *i2c = &i2c_pxa; |
841 | struct resource *res; | 841 | struct resource *res; |
842 | #ifdef CONFIG_I2C_PXA_SLAVE | ||
843 | struct i2c_pxa_platform_data *plat = dev->dev.platform_data; | 842 | struct i2c_pxa_platform_data *plat = dev->dev.platform_data; |
844 | #endif | ||
845 | int ret; | 843 | int ret; |
846 | int irq; | 844 | int irq; |
847 | 845 | ||
@@ -911,6 +909,10 @@ static int i2c_pxa_probe(struct platform_device *dev) | |||
911 | i2c->adap.algo_data = i2c; | 909 | i2c->adap.algo_data = i2c; |
912 | i2c->adap.dev.parent = &dev->dev; | 910 | i2c->adap.dev.parent = &dev->dev; |
913 | 911 | ||
912 | if (plat) { | ||
913 | i2c->adap.class = plat->class; | ||
914 | } | ||
915 | |||
914 | ret = i2c_add_adapter(&i2c->adap); | 916 | ret = i2c_add_adapter(&i2c->adap); |
915 | if (ret < 0) { | 917 | if (ret < 0) { |
916 | printk(KERN_INFO "I2C: Failed to add bus\n"); | 918 | printk(KERN_INFO "I2C: Failed to add bus\n"); |