Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 6 insertions, 2 deletions

diff --git a/arch/arm/plat-samsung/pm-gpio.c b/arch/arm/plat-samsung/pm-gpio.c
index d50ab9d2af53..7df03f87fbfa 100644
--- a/arch/arm/plat-samsung/pm-gpio.c
+++ b/arch/arm/plat-samsung/pm-gpio.c
@@ -331,8 +331,10 @@ void s3c_pm_save_gpios(void)
 
         for (gpio_nr = 0; gpio_nr < S3C_GPIO_END;) {
                 ourchip = s3c_gpiolib_getchip(gpio_nr);
-                if (!ourchip)
+                if (!ourchip) {
+                        gpio_nr++;
                         continue;
+                }
 
                 s3c_pm_save_gpio(ourchip);
 
@@ -369,8 +371,10 @@ void s3c_pm_restore_gpios(void)
 
         for (gpio_nr = 0; gpio_nr < S3C_GPIO_END;) {
                 ourchip = s3c_gpiolib_getchip(gpio_nr);
-                if (!ourchip)
+                if (!ourchip) {
+                        gpio_nr++;
                         continue;
+                }
 
                 s3c_pm_resume_gpio(ourchip);