summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorJaehoon Chung2011-10-12 06:14:29 +0200
committerChris Ball2011-10-26 22:32:22 +0200
commit326adda53a50ece492c3edaa60afc26fba5e3232 (patch)
tree5ca2a03185d9e85a531585201c61fb2ede0100fe /drivers/mmc
parentmmc: replace printk with appropriate display macro (diff)
downloadkernel-qcow2-linux-326adda53a50ece492c3edaa60afc26fba5e3232.tar.gz
kernel-qcow2-linux-326adda53a50ece492c3edaa60afc26fba5e3232.tar.xz
kernel-qcow2-linux-326adda53a50ece492c3edaa60afc26fba5e3232.zip
mmc: sdhci-s3c: fix potential NULL dereference
sc->clk_bus[ptr] could be NULL. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci-s3c.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 82709b6da861..3d00e722efc9 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -567,8 +567,10 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
err_req_regs:
for (ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
- clk_disable(sc->clk_bus[ptr]);
- clk_put(sc->clk_bus[ptr]);
+ if (sc->clk_bus[ptr]) {
+ clk_disable(sc->clk_bus[ptr]);
+ clk_put(sc->clk_bus[ptr]);
+ }
}
err_no_busclks: