recipes/linux/linux-gumstix-2.6.15/i2c-gpl-module-fix.patch

   1 Index: linux-2.6.15gum/drivers/i2c/busses/i2c-pxa.c
   2 ===================================================================
   3 --- linux-2.6.15gum.orig/drivers/i2c/busses/i2c-pxa.c
   4 +++ linux-2.6.15gum/drivers/i2c/busses/i2c-pxa.c
   5 @@ -32,7 +32,6 @@
   6  #include <linux/i2c-pxa.h>
   7  #include <linux/platform_device.h>
   8
   9 -#include <asm/arch/pxa-regs.h>
  10  #include <asm/hardware.h>
  11  #include <asm/irq.h>
  12  #include <asm/arch/i2c.h>
  13 @@ -900,6 +899,12 @@ static int i2c_pxa_xfer(struct i2c_adapt
  14         struct pxa_i2c *i2c = adap->algo_data;
  15         int ret, i;
  16
  17 +       /* If the I2C controller is disabled we need to reset it (probably due
  18 +          to a suspend/resume destroying state). We do this here as we can then
  19 +          avoid worrying about resuming the controller before its users. */
  20 +       if (!(ICR & ICR_IUE))
  21 +               i2c_pxa_reset(i2c);
  22 +
  23         for (i = adap->retries; i >= 0; i--) {
  24                 ret = i2c_pxa_do_xfer(i2c, msgs, num);
  25                 if (ret != I2C_RETRY)
  26 @@ -940,7 +945,9 @@ static struct pxa_i2c i2c_pxa = {
  27  static int i2c_pxa_probe(struct platform_device *dev)
  28  {
  29         struct pxa_i2c *i2c = &i2c_pxa;
  30 +#ifdef CONFIG_I2C_PXA_SLAVE
  31         struct i2c_pxa_platform_data *plat = dev->dev.platform_data;
  32 +#endif
  33         int ret;
  34
  35  #ifdef CONFIG_PXA27x
  36 @@ -1025,5 +1032,7 @@ static void i2c_adap_pxa_exit(void)
  37         return platform_driver_unregister(&i2c_pxa_driver);
  38  }
  39
  40 +MODULE_LICENSE("GPL");
  41 +
  42  module_init(i2c_adap_pxa_init);
  43  module_exit(i2c_adap_pxa_exit);