Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / drivers / spi / spi-pxa2xx.c

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 4cb515a3104c1759b451c1f2d313953c009fb3ce..b0822d1dba298fced70045495f48f33d49db8ca3 100644 (file)
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1237,7 +1237,7 @@ static int setup_cs(struct spi_device *spi, struct chip_data *chip,
         * different chip_info, release previously requested GPIO
         */
        if (chip->gpiod_cs) {
-               gpio_free(desc_to_gpio(chip->gpiod_cs));
+               gpiod_put(chip->gpiod_cs);
                chip->gpiod_cs = NULL;
        }
 
@@ -1417,7 +1417,7 @@ static void cleanup(struct spi_device *spi)
 
        if (drv_data->ssp_type != CE4100_SSP && !drv_data->cs_gpiods &&
            chip->gpiod_cs)
-               gpio_free(desc_to_gpio(chip->gpiod_cs));
+               gpiod_put(chip->gpiod_cs);
 
        kfree(chip);
 }