diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 23:18:40 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 23:18:40 +0100 |
| commit | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (patch) | |
| tree | 6517919cb60bd9465078512cacbefd8c77f94b76 /drivers/spi | |
| parent | Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel (diff) | |
| parent | IXP4xx: support for Goramo MultiLink router platform. (diff) | |
| download | linux-dev-fc05505b77f7900a1bb74fb3f3a4343dee4265a4.tar.xz linux-dev-fc05505b77f7900a1bb74fb3f3a4343dee4265a4.zip | |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/pxa2xx_spi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index 885194a07418..3f3c08c6ba4e 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c @@ -1373,6 +1373,9 @@ static void cleanup(struct spi_device *spi) { struct chip_data *chip = spi_get_ctldata(spi); + if (!chip) + return; + if (gpio_is_valid(chip->gpio_cs)) gpio_free(chip->gpio_cs); |