From 7692191c2f108a9f37721ece43137fb18e986e05 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sun, 3 Mar 2013 20:19:07 -0800 Subject: [PATCH] --- yaml --- r: 361025 b: refs/heads/master c: f94352f8db97b9a3b3c1ec45f6fef1400880168a h: refs/heads/master i: 361023: ef63121d6e0fb6ba474e3a61f7a34ede93aa239f v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/ads7846.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e47dfe225f05..3220d46566f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39735019716e93914a366ac1fb2e78f91b170545 +refs/heads/master: f94352f8db97b9a3b3c1ec45f6fef1400880168a diff --git a/trunk/drivers/input/touchscreen/ads7846.c b/trunk/drivers/input/touchscreen/ads7846.c index 4f702b3ec1a3..434c3df250ca 100644 --- a/trunk/drivers/input/touchscreen/ads7846.c +++ b/trunk/drivers/input/touchscreen/ads7846.c @@ -236,7 +236,12 @@ static void __ads7846_disable(struct ads7846 *ts) /* Must be called with ts->lock held */ static void __ads7846_enable(struct ads7846 *ts) { - regulator_enable(ts->reg); + int error; + + error = regulator_enable(ts->reg); + if (error != 0) + dev_err(&ts->spi->dev, "Failed to enable supply: %d\n", error); + ads7846_restart(ts); }