aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-05 12:01:07 +0000
committerSamuel Ortiz <sameo@linux.intel.com>2012-01-09 00:37:40 +0100
commit5391b5c645a86d4657c2175acbf21c6461d34849 (patch)
tree0ad97dccec2cd3338c8d552c4ebef9ea73173f7e /drivers/mfd
parentmfd: Convert WM8400 to devm_kzalloc() (diff)
downloadlinux-dev-5391b5c645a86d4657c2175acbf21c6461d34849.tar.xz
linux-dev-5391b5c645a86d4657c2175acbf21c6461d34849.zip
mfd: Return an error on failed wm831x register writes
Got dropped in the regmap conversion. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/wm831x-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index 3b761893f9ba..f5e54fae8ada 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -559,6 +559,8 @@ static int wm831x_write(struct wm831x *wm831x, unsigned short reg,
dev_vdbg(wm831x->dev, "Write %04x to R%d(0x%x)\n",
buf[i], reg + i, reg + i);
ret = regmap_write(wm831x->regmap, reg + i, buf[i]);
+ if (ret != 0)
+ return ret;
}
return 0;