---

yaml --- r: 373623 b: refs/heads/master c: f39f54a h: refs/heads/master i: 373621: 8f8cdd9 373619: fe35020 373615: 1609e98 v: v3
git-mirror · Mar 27, 2013 · 753ff33 · 753ff33
1 parent e610aea
commit 753ff33
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 632d8e55d1f0304579315669bfadcab7352973fd
+refs/heads/master: f39f54af032ce900815d0d718df5f1717eed50fe
diff --git a/trunk/drivers/gpio/gpio-pcf857x.c b/trunk/drivers/gpio/gpio-pcf857x.c
@@ -268,7 +268,7 @@ static int pcf857x_probe(struct i2c_client *client,
 	}
 
 	/* Allocate, initialize, and register this gpio_chip. */
-	gpio = kzalloc(sizeof *gpio, GFP_KERNEL);
+	gpio = devm_kzalloc(&client->dev, sizeof(*gpio), GFP_KERNEL);
 	if (!gpio)
 		return -ENOMEM;
 
@@ -391,7 +391,6 @@ static int pcf857x_probe(struct i2c_client *client,
 	if (pdata && client->irq)
 		pcf857x_irq_domain_cleanup(gpio);
 
-	kfree(gpio);
 	return status;
 }
 
@@ -416,9 +415,7 @@ static int pcf857x_remove(struct i2c_client *client)
 		pcf857x_irq_domain_cleanup(gpio);
 
 	status = gpiochip_remove(&gpio->chip);
-	if (status == 0)
-		kfree(gpio);
-	else
+	if (status)
 		dev_err(&client->dev, "%s --> %d\n", "remove", status);
 	return status;
 }