diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 21:26:16 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 21:26:16 (GMT) |
| commit | 24109afd17426e1a2b72141e4a2b730057e1a0ea (patch) | |
| tree | 590f708decdc1144dd50d4723c5d106d4e248452 /drivers | |
| parent | 659fb32d1b67476f4ade25e9ea0e2642a5b9c4b5 (diff) | |
| parent | 512b7938fefd03d512463aa597a1216cf088dfe3 (diff) | |
| download | linux-fsl-qoriq-24109afd17426e1a2b72141e4a2b730057e1a0ea.tar.xz | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_vpac270.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/pxa2xx_vpac270.c b/drivers/pcmcia/pxa2xx_vpac270.c index 712baab..e956f65 100644 --- a/drivers/pcmcia/pxa2xx_vpac270.c +++ b/drivers/pcmcia/pxa2xx_vpac270.c @@ -76,10 +76,10 @@ static int vpac270_pcmcia_hw_init(struct soc_pcmcia_socket *skt) static void vpac270_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt) { if (skt->nr == 0) - gpio_request_array(vpac270_pcmcia_gpios, + gpio_free_array(vpac270_pcmcia_gpios, ARRAY_SIZE(vpac270_pcmcia_gpios)); else - gpio_request_array(vpac270_cf_gpios, + gpio_free_array(vpac270_cf_gpios, ARRAY_SIZE(vpac270_cf_gpios)); } |