summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Patard2010-04-03 10:31:33 +0200
committerNicolas Pitre2010-05-03 22:34:47 +0200
commit5ccc8dab611fcd1d0961b73e22d6c2d108967862 (patch)
tree32bce8e01437bcbb78d63b68864de90ace3d65db
parent[ARM] Kirkwood: Marvell GuruPlug support (diff)
downloadkernel-qcow2-linux-5ccc8dab611fcd1d0961b73e22d6c2d108967862.tar.gz
kernel-qcow2-linux-5ccc8dab611fcd1d0961b73e22d6c2d108967862.tar.xz
kernel-qcow2-linux-5ccc8dab611fcd1d0961b73e22d6c2d108967862.zip
[ARM] dns323-setup.c: fix WARN() when booting
Since commit b2a731aa5cbca7e0252da75e16de7ae5feb1313a, dns323_init() is setting the power led gpio direction with gpio_direction_output() but doesn't request the gpio before (which is not permitted by the gpio layer afaik). This behaviour is triggering a WARN() at boot time. Tested-by: Christian Samsel <csamsel@gmxpro.de> Cc: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Nicolas Pitre <nico@marvell.com> [ Part 2: "Attached Text" ]
-rw-r--r--arch/arm/mach-orion5x/dns323-setup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 421b82f7c63d..685f34a9634b 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -439,6 +439,7 @@ static void __init dns323_init(void)
*/
if (dns323_dev_id() == MV88F5181_DEV_ID) {
dns323_leds[0].active_low = 1;
+ gpio_request(DNS323_GPIO_LED_POWER1, "Power Led Enable");
gpio_direction_output(DNS323_GPIO_LED_POWER1, 0);
}