From 675bd7b72245f28f4cf96a5304bf3707b69834f4 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 5 Sep 2012 10:40:51 +0200 Subject: [PATCH] --- yaml --- r: 328455 b: refs/heads/master c: 72eac3020de35a2c3fd0d39a26399989a0a9392e h: refs/heads/master i: 328453: 8be59c973470ce5a59a7f99c03511119e5e657de 328451: 5f509ff0849bee2febc044068978ca86f3740843 328447: b003e5e59922d0e9458ebf4af7243454989672f3 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-74x164.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e1b758ba654f..d261c0c72174 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab3b8782618c046386b85ada5e0e789212f17cf8 +refs/heads/master: 72eac3020de35a2c3fd0d39a26399989a0a9392e diff --git a/trunk/drivers/gpio/gpio-74x164.c b/trunk/drivers/gpio/gpio-74x164.c index 2975036c36b7..604b998b7b74 100644 --- a/trunk/drivers/gpio/gpio-74x164.c +++ b/trunk/drivers/gpio/gpio-74x164.c @@ -90,7 +90,7 @@ static int __devinit gen_74x164_probe(struct spi_device *spi) if (ret < 0) return ret; - chip = kzalloc(sizeof(*chip), GFP_KERNEL); + chip = devm_kzalloc(&spi->dev, sizeof(*chip), GFP_KERNEL); if (!chip) return -ENOMEM; @@ -125,7 +125,6 @@ static int __devinit gen_74x164_probe(struct spi_device *spi) exit_destroy: dev_set_drvdata(&spi->dev, NULL); mutex_destroy(&chip->lock); - kfree(chip); return ret; } @@ -141,10 +140,9 @@ static int __devexit gen_74x164_remove(struct spi_device *spi) dev_set_drvdata(&spi->dev, NULL); ret = gpiochip_remove(&chip->gpio_chip); - if (!ret) { + if (!ret) mutex_destroy(&chip->lock); - kfree(chip); - } else + else dev_err(&spi->dev, "Failed to remove the GPIO controller: %d\n", ret);