mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
To: me@felipe.balbi.com
Cc: linux-kernel@vger.kernel.org, rpurdie@linux.intel.com,
	rpurdie@rpsys.net, srcvale@holoscopio.com,
	Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Subject: [PATCH 2/3] Fix multiple requests and releases of IRQ for GPIO LED Trigger.
Date: Tue, 14 Jul 2009 14:03:34 -0300	[thread overview]
Message-ID: <1247591015-2428-2-git-send-email-cascardo@holoscopio.com> (raw)
In-Reply-To: <1247591015-2428-1-git-send-email-cascardo@holoscopio.com>

When setting the same GPIO number, multiple IRQ shared requests will be
done without freing the previous request. It will also try to free a
failed request or an already freed IRQ if 0 was written to the gpio
file.

All these oops and leaks were fixed with the following solution: keep
the previous allocated GPIO (if any) still allocated in case the new
request fails. The alternative solution would desallocate the previous
allocated GPIO and set gpio as 0.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Signed-off-by: Samuel R. C. Vale <srcvale@holoscopio.com>
---
 drivers/leds/ledtrig-gpio.c |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/drivers/leds/ledtrig-gpio.c b/drivers/leds/ledtrig-gpio.c
index 6b7bb12..7c9aff9 100644
--- a/drivers/leds/ledtrig-gpio.c
+++ b/drivers/leds/ledtrig-gpio.c
@@ -146,20 +146,26 @@ static ssize_t gpio_trig_gpio_store(struct device *dev,
 		return -EINVAL;
 	}
 
+	if (gpio_data->gpio == gpio)
+		return n;
+
 	if (!gpio) {
-		free_irq(gpio_to_irq(gpio_data->gpio), led);
+		if (gpio_data->gpio != 0)
+			free_irq(gpio_to_irq(gpio_data->gpio), led);
+		gpio_data->gpio = 0;
 		return n;
 	}
 
-	if (gpio_data->gpio > 0 && gpio_data->gpio != gpio)
-		free_irq(gpio_to_irq(gpio_data->gpio), led);
-
-	gpio_data->gpio = gpio;
 	ret = request_irq(gpio_to_irq(gpio), gpio_trig_irq,
 			IRQF_SHARED | IRQF_TRIGGER_RISING
 			| IRQF_TRIGGER_FALLING, "ledtrig-gpio", led);
-	if (ret)
+	if (ret) {
 		dev_err(dev, "request_irq failed with error %d\n", ret);
+	} else {
+		if (gpio_data->gpio != 0)
+			free_irq(gpio_to_irq(gpio_data->gpio), led);
+		gpio_data->gpio = gpio;
+	}
 
 	return ret ? ret : n;
 }
@@ -211,7 +217,8 @@ static void gpio_trig_deactivate(struct led_classdev *led)
 		device_remove_file(led->dev, &dev_attr_inverted);
 		device_remove_file(led->dev, &dev_attr_desired_brightness);
 		flush_work(&gpio_data->work);
-		free_irq(gpio_to_irq(gpio_data->gpio),led);
+		if (gpio_data->gpio != 0)
+			free_irq(gpio_to_irq(gpio_data->gpio), led);
 		kfree(gpio_data);
 	}
 }
-- 
1.6.3.3


  reply	other threads:[~2009-07-14 17:11 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-14 17:03 [PATCH 1/3] Trivial: Fix coding style in worker thread code for ledtrig-gpio Thadeu Lima de Souza Cascardo
2009-07-14 17:03 ` Thadeu Lima de Souza Cascardo [this message]
2009-07-14 17:03   ` [PATCH 3/3] After setting inverted attribute, we must update the LED Thadeu Lima de Souza Cascardo
2009-07-14 17:58 ` [PATCH] Trivial: Fix coding style in worker thread code for ledtrig-gpio Thadeu Lima de Souza Cascardo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1247591015-2428-2-git-send-email-cascardo@holoscopio.com \
    --to=cascardo@holoscopio.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=me@felipe.balbi.com \
    --cc=rpurdie@linux.intel.com \
    --cc=rpurdie@rpsys.net \
    --cc=srcvale@holoscopio.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®