Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361025
b: refs/heads/master
c: f94352f
h: refs/heads/master
i:
  361023: ef63121
v: v3
  • Loading branch information
Mark Brown authored and Dmitry Torokhov committed Mar 11, 2013
1 parent fc6cc9a commit 7692191
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 39735019716e93914a366ac1fb2e78f91b170545
refs/heads/master: f94352f8db97b9a3b3c1ec45f6fef1400880168a
7 changes: 6 additions & 1 deletion trunk/drivers/input/touchscreen/ads7846.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 7692191

Please sign in to comment.