r4133 - branches/src/target/kernel/2.6.24.x/patches

[werner at sita.openmoko.org]

Author: werner
Date: 2008-02-29 04:07:59 +0100 (Fri, 29 Feb 2008)
New Revision: 4133

Modified:
   branches/src/target/kernel/2.6.24.x/patches/fix-i2c-s3c2410-resume-race.patch
Log:
fix-i2c.patch by Tim Niemeyer

fix-i2c-s3c2410-resume-race.patch:
- drivers/i2c/busses/i2c-s3c2410.c (s3c2410_i2c_driver): add suspend callback
  also to 2410 driver
- drivers/i2c/busses/i2c-s3c2410.c (s3c24xx_i2c_doxfer): print suspend count on   rejection



Modified: branches/src/target/kernel/2.6.24.x/patches/fix-i2c-s3c2410-resume-race.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/fix-i2c-s3c2410-resume-race.patch	2008-02-28 13:32:35 UTC (rev 4132)
+++ branches/src/target/kernel/2.6.24.x/patches/fix-i2c-s3c2410-resume-race.patch	2008-02-29 03:07:59 UTC (rev 4133)
@@ -52,12 +52,14 @@
  		goto out_ack;
  
  	case STATE_START:
-@@ -502,6 +512,12 @@ static int s3c24xx_i2c_doxfer(struct s3c
+@@ -502,6 +512,14 @@ static int s3c24xx_i2c_doxfer(struct s3c
  	unsigned long timeout;
  	int ret;
  
 +	if (i2c->suspended) {
-+		dev_err(i2c->dev, "Hey I am still asleep, retry later\n");
++		dev_err(i2c->dev,
++		    "Hey I am still asleep (suspended: %d), retry later\n",
++		    i2c->suspended);
 +		ret = -EAGAIN;
 +		goto out;
 +	}
@@ -65,7 +67,7 @@
  	ret = s3c24xx_i2c_set_master(i2c);
  	if (ret != 0) {
  		dev_err(i2c->dev, "cannot get bus (error %d)\n", ret);
-@@ -886,6 +902,17 @@ static int s3c24xx_i2c_remove(struct pla
+@@ -886,6 +904,17 @@ static int s3c24xx_i2c_remove(struct pla
  }
  
  #ifdef CONFIG_PM
@@ -83,7 +85,7 @@
  static int s3c24xx_i2c_resume(struct platform_device *dev)
  {
  	struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
-@@ -893,6 +920,8 @@ static int s3c24xx_i2c_resume(struct pla
+@@ -893,6 +922,8 @@ static int s3c24xx_i2c_resume(struct pla
  	if (i2c != NULL)
  		s3c24xx_i2c_init(i2c);
  
@@ -92,7 +94,15 @@
  	return 0;
  }
  
-@@ -915,6 +944,7 @@ static struct platform_driver s3c2410_i2
+@@ -905,6 +936,7 @@ static int s3c24xx_i2c_resume(struct pla
+ static struct platform_driver s3c2410_i2c_driver = {
+ 	.probe		= s3c24xx_i2c_probe,
+ 	.remove		= s3c24xx_i2c_remove,
++	.suspend	= s3c24xx_i2c_suspend,
+ 	.resume		= s3c24xx_i2c_resume,
+ 	.driver		= {
+ 		.owner	= THIS_MODULE,
+@@ -915,6 +947,7 @@ static struct platform_driver s3c2410_i2
  static struct platform_driver s3c2440_i2c_driver = {
  	.probe		= s3c24xx_i2c_probe,
  	.remove		= s3c24xx_i2c_remove,