diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 18:57:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 18:57:55 +0200 |
| commit | 8f2adb7cab81fc4984ddfe3a1efd1b62d52bead8 (patch) | |
| tree | 75f48007900d3386cfaa0e9d5ad460f6c51f1635 /drivers/gpio | |
| parent | Linux 2.6.34-rc6 (diff) | |
| parent | spi: spidev_test gives error upon 1-byte transfer (diff) | |
| download | linux-8f2adb7cab81fc4984ddfe3a1efd1b62d52bead8.tar.xz linux-8f2adb7cab81fc4984ddfe3a1efd1b62d52bead8.zip | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6:
spi: spidev_test gives error upon 1-byte transfer
omap2_mcspi: small fixes of output data format
omap2_mcspi: Flush posted writes
spi: spi_device memory should be released instead of device.
spi: release device claimed by bus_find_device_by_name
of: check for IS_ERR()
serial/mpc52xx_uart: Drop outdated comments
gpio: potential null dereference
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 76be229c814d..eb0c3fe44b29 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -416,7 +416,8 @@ static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev, return 0; free_sd: - sysfs_put(pdesc->value_sd); + if (pdesc) + sysfs_put(pdesc->value_sd); free_id: idr_remove(&pdesc_idr, id); desc->flags &= GPIO_FLAGS_MASK; |