浏览代码

pcmcia: soc_common: Handle return value of clk_prepare_enable

clk_prepare_enable() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
CC: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Arvind Yadav 8 年之前
父节点
当前提交
d3fdd70124
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      drivers/pcmcia/soc_common.c

+ 6 - 2
drivers/pcmcia/soc_common.c

@@ -191,12 +191,16 @@ static int soc_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
 {
 	int ret = 0, i;
 	int ret = 0, i;
 
 
-	clk_prepare_enable(skt->clk);
+	ret = clk_prepare_enable(skt->clk);
+	if (ret)
+		return ret;
 
 
 	if (skt->ops->hw_init) {
 	if (skt->ops->hw_init) {
 		ret = skt->ops->hw_init(skt);
 		ret = skt->ops->hw_init(skt);
-		if (ret)
+		if (ret) {
+			clk_disable_unprepare(skt->clk);
 			return ret;
 			return ret;
+		}
 	}
 	}
 
 
 	for (i = 0; i < ARRAY_SIZE(skt->stat); i++) {
 	for (i = 0; i < ARRAY_SIZE(skt->stat); i++) {