diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-04 13:16:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-04 13:16:28 +0100 |
| commit | 0d157a4f0183da38d97cf2a2e22e63484f6aadb7 (patch) | |
| tree | 45e70dd7129131dbdd123d78deb254152eaa2070 /drivers/base | |
| parent | c00a30dfd0f0502102668bb43258742e07adf591 (diff) | |
| parent | abd3d40de3b35b9bdea7fa27a7cbfe1ee3dbd1b9 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index a941dcfe759..d0c81d1f409 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1717,7 +1717,7 @@ int regmap_async_complete(struct regmap *map) int ret; /* Nothing to do with no async support */ - if (!map->bus->async_write) + if (!map->bus || !map->bus->async_write) return 0; trace_regmap_async_complete_start(map->dev); |