Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / arch / arm / plat-samsung / pm-gpio.c

diff --git a/arch/arm/plat-samsung/pm-gpio.c b/arch/arm/plat-samsung/pm-gpio.c
index d50ab9d2af53ff9083122f61097d69114757ae60..7df03f87fbfabfd68c681afc25e6f78d8974f0ed 100644 (file)
--- 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);