Skip to content

Commit

Permalink
regmap: use IS_ERR() to check clk_get() results
Browse files Browse the repository at this point in the history
clk_get() returns an error pointer, or a valid token to pass back to the
clock API. Hence, the result must be checked with IS_ERR(), not by
comparison against NULL.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Stephen Warren authored and Mark Brown committed Nov 26, 2013
1 parent 6ce4eac commit 6b8e090
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/base/regmap/regmap-mmio.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ static int regmap_mmio_gather_write(void *context,

BUG_ON(reg_size != 4);

if (ctx->clk) {
if (!IS_ERR(ctx->clk)) {
ret = clk_enable(ctx->clk);
if (ret < 0)
return ret;
Expand Down Expand Up @@ -73,7 +73,7 @@ static int regmap_mmio_gather_write(void *context,
offset += ctx->val_bytes;
}

if (ctx->clk)
if (!IS_ERR(ctx->clk))
clk_disable(ctx->clk);

return 0;
Expand All @@ -96,7 +96,7 @@ static int regmap_mmio_read(void *context,

BUG_ON(reg_size != 4);

if (ctx->clk) {
if (!IS_ERR(ctx->clk)) {
ret = clk_enable(ctx->clk);
if (ret < 0)
return ret;
Expand Down Expand Up @@ -129,7 +129,7 @@ static int regmap_mmio_read(void *context,
offset += ctx->val_bytes;
}

if (ctx->clk)
if (!IS_ERR(ctx->clk))
clk_disable(ctx->clk);

return 0;
Expand All @@ -139,7 +139,7 @@ static void regmap_mmio_free_context(void *context)
{
struct regmap_mmio_context *ctx = context;

if (ctx->clk) {
if (!IS_ERR(ctx->clk)) {
clk_unprepare(ctx->clk);
clk_put(ctx->clk);
}
Expand Down Expand Up @@ -209,6 +209,7 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,

ctx->regs = regs;
ctx->val_bytes = config->val_bits / 8;
ctx->clk = ERR_PTR(-ENODEV);

if (clk_id == NULL)
return ctx;
Expand Down

0 comments on commit 6b8e090

Please sign in to comment.