From 1e43c6477c8bee6a3f25574c46763e8b06df6ded Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 1 Dec 2011 09:55:07 +0800 Subject: [PATCH] --- yaml --- r: 284566 b: refs/heads/master c: b04edb934966b824b5d61edab76f257c10e31299 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/twl6040-core.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c83da5728903..69584eb249de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e9daaca8d265151789c78a695ffdc774d2af850 +refs/heads/master: b04edb934966b824b5d61edab76f257c10e31299 diff --git a/trunk/drivers/mfd/twl6040-core.c b/trunk/drivers/mfd/twl6040-core.c index 7f06685187f4..dda86293dc9f 100644 --- a/trunk/drivers/mfd/twl6040-core.c +++ b/trunk/drivers/mfd/twl6040-core.c @@ -509,13 +509,10 @@ static int __devinit twl6040_probe(struct platform_device *pdev) twl6040->audpwron = -EINVAL; if (gpio_is_valid(twl6040->audpwron)) { - ret = gpio_request(twl6040->audpwron, "audpwron"); + ret = gpio_request_one(twl6040->audpwron, GPIOF_OUT_INIT_LOW, + "audpwron"); if (ret) goto gpio1_err; - - ret = gpio_direction_output(twl6040->audpwron, 0); - if (ret) - goto gpio2_err; } /* codec interrupt */