git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.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
69a4c7f
..
7df03f8
100644
(file)
--- a/
arch/arm/plat-samsung/pm-gpio.c
+++ b/
arch/arm/plat-samsung/pm-gpio.c
@@
-329,10
+329,12
@@
void s3c_pm_save_gpios(void)
struct s3c_gpio_chip *ourchip;
unsigned int gpio_nr;
struct s3c_gpio_chip *ourchip;
unsigned int gpio_nr;
- for (gpio_nr = 0; gpio_nr < S3C_GPIO_END;
gpio_nr++
) {
+ for (gpio_nr = 0; gpio_nr < S3C_GPIO_END;) {
ourchip = s3c_gpiolib_getchip(gpio_nr);
ourchip = s3c_gpiolib_getchip(gpio_nr);
- if (!ourchip)
+ if (!ourchip) {
+ gpio_nr++;
continue;
continue;
+ }
s3c_pm_save_gpio(ourchip);
s3c_pm_save_gpio(ourchip);
@@
-367,10
+369,12
@@
void s3c_pm_restore_gpios(void)
struct s3c_gpio_chip *ourchip;
unsigned int gpio_nr;
struct s3c_gpio_chip *ourchip;
unsigned int gpio_nr;
- for (gpio_nr = 0; gpio_nr < S3C_GPIO_END;
gpio_nr++
) {
+ for (gpio_nr = 0; gpio_nr < S3C_GPIO_END;) {
ourchip = s3c_gpiolib_getchip(gpio_nr);
ourchip = s3c_gpiolib_getchip(gpio_nr);
- if (!ourchip)
+ if (!ourchip) {
+ gpio_nr++;
continue;
continue;
+ }
s3c_pm_resume_gpio(ourchip);
s3c_pm_resume_gpio(ourchip);