projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0bdb861
)
ASoC: fsi: Add check for clk_enable
author
Jiasheng Jiang
<jiasheng@iscas.ac.cn>
Wed, 2 Mar 2022 06:28:44 +0000
(14:28 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 12:23:20 +0000
(14:23 +0200)
[ Upstream commit
405afed8a728f23cfaa02f75bbc8bdd6b7322123
]
As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.
Fixes: ab6f6d85210c ("ASoC: fsi: add master clock control functions")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Link:
https://lore.kernel.org/r/20220302062844.46869-1-jiasheng@iscas.ac.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/sh/fsi.c
patch
|
blob
|
history
diff --git
a/sound/soc/sh/fsi.c
b/sound/soc/sh/fsi.c
index cdf3b7f69ba706b99941692b56961c8284070efd..e9a1eb6bdf66aeba24fd798f711201d6b5133ee4 100644
(file)
--- a/
sound/soc/sh/fsi.c
+++ b/
sound/soc/sh/fsi.c
@@
-816,14
+816,27
@@
static int fsi_clk_enable(struct device *dev,
return ret;
}
- clk_enable(clock->xck);
- clk_enable(clock->ick);
- clk_enable(clock->div);
+ ret = clk_enable(clock->xck);
+ if (ret)
+ goto err;
+ ret = clk_enable(clock->ick);
+ if (ret)
+ goto disable_xck;
+ ret = clk_enable(clock->div);
+ if (ret)
+ goto disable_ick;
clock->count++;
}
return ret;
+
+disable_ick:
+ clk_disable(clock->ick);
+disable_xck:
+ clk_disable(clock->xck);
+err:
+ return ret;
}
static int fsi_clk_disable(struct device *dev,