From 779b227a564fcef0d1dcfab9415854d666df2fb9 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Tue, 15 Dec 2009 20:07:31 +0100 Subject: [PATCH] --- yaml --- r: 177738 b: refs/heads/master c: 6f17c65240e35ae99319c659c74d54100a832f45 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/wm831x-ldo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 32c3c1f74b37..2bd2c97e6270 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf9836f4ddd1a08e88fe05e06f21313c609d3d55 +refs/heads/master: 6f17c65240e35ae99319c659c74d54100a832f45 diff --git a/trunk/drivers/regulator/wm831x-ldo.c b/trunk/drivers/regulator/wm831x-ldo.c index 902db56ce099..61e02ac2fda3 100644 --- a/trunk/drivers/regulator/wm831x-ldo.c +++ b/trunk/drivers/regulator/wm831x-ldo.c @@ -470,7 +470,7 @@ static unsigned int wm831x_aldo_get_mode(struct regulator_dev *rdev) struct wm831x_ldo *ldo = rdev_get_drvdata(rdev); struct wm831x *wm831x = ldo->wm831x; int on_reg = ldo->base + WM831X_LDO_ON_CONTROL; - unsigned int ret; + int ret; ret = wm831x_reg_read(wm831x, on_reg); if (ret < 0)