All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Input: lm8323: add missing device_remove_file for dev_attr_time
@ 2011-07-28  9:07 Axel Lin
  2011-07-30 19:07 ` Dmitry Torokhov
  0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2011-07-28  9:07 UTC (permalink / raw)
  To: linux-kernel; +Cc: Felipe Balbi, Dmitry Torokhov, linux-input

Add missing device_remove_file() for dev_attr_time in lm8323_remove().
Also calling device_remove_file() in lm8323_probe() error path to
remove sysfs attribute file.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/input/keyboard/lm8323.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
index ab0acaf..756348a 100644
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
@@ -754,8 +754,11 @@ fail3:
 	device_remove_file(&client->dev, &dev_attr_disable_kp);
 fail2:
 	while (--pwm >= 0)
-		if (lm->pwm[pwm].enabled)
+		if (lm->pwm[pwm].enabled) {
+			device_remove_file(lm->pwm[pwm].cdev.dev,
+					   &dev_attr_time);
 			led_classdev_unregister(&lm->pwm[pwm].cdev);
+		}
 fail1:
 	input_free_device(idev);
 	kfree(lm);
@@ -775,8 +778,10 @@ static int __devexit lm8323_remove(struct i2c_client *client)
 	device_remove_file(&lm->client->dev, &dev_attr_disable_kp);
 
 	for (i = 0; i < 3; i++)
-		if (lm->pwm[i].enabled)
+		if (lm->pwm[i].enabled) {
+			device_remove_file(lm->pwm[i].cdev.dev, &dev_attr_time);
 			led_classdev_unregister(&lm->pwm[i].cdev);
+		}
 
 	kfree(lm);
 
-- 
1.7.4.1




^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Input: lm8323: add missing device_remove_file for dev_attr_time
  2011-07-28  9:07 [PATCH] Input: lm8323: add missing device_remove_file for dev_attr_time Axel Lin
@ 2011-07-30 19:07 ` Dmitry Torokhov
  0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2011-07-30 19:07 UTC (permalink / raw)
  To: Axel Lin; +Cc: linux-kernel, Felipe Balbi, linux-input

On Thu, Jul 28, 2011 at 05:07:01PM +0800, Axel Lin wrote:
> Add missing device_remove_file() for dev_attr_time in lm8323_remove().
> Also calling device_remove_file() in lm8323_probe() error path to
> remove sysfs attribute file.
> 
> Signed-off-by: Axel Lin <axel.lin@gmail.com>

Applied, thanks Axel.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-07-30 19:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-28  9:07 [PATCH] Input: lm8323: add missing device_remove_file for dev_attr_time Axel Lin
2011-07-30 19:07 ` Dmitry Torokhov

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.