From 92357e21cbc89a2086e6773e5b0e565d6e64cb57 Mon Sep 17 00:00:00 2001 From: Rajeshwari Shinde Date: Thu, 3 Nov 2011 10:52:58 +0900 Subject: [PATCH] --- yaml --- r: 281612 b: refs/heads/master c: 4346b6d9c6651121f35ae9e42f240f36a8e56ce6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci-s3c.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4aa039e632e0..637660d89995 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a361d10a2b490812b051433b1aad5b4351372597 +refs/heads/master: 4346b6d9c6651121f35ae9e42f240f36a8e56ce6 diff --git a/trunk/drivers/mmc/host/sdhci-s3c.c b/trunk/drivers/mmc/host/sdhci-s3c.c index cb60c4197e0a..6b3f3664edeb 100644 --- a/trunk/drivers/mmc/host/sdhci-s3c.c +++ b/trunk/drivers/mmc/host/sdhci-s3c.c @@ -435,14 +435,11 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) for (clks = 0, ptr = 0; ptr < MAX_BUS_CLK; ptr++) { struct clk *clk; - char *name = pdata->clocks[ptr]; - - if (name == NULL) - continue; + char name[14]; + snprintf(name, 14, "mmc_busclk.%d", ptr); clk = clk_get(dev, name); if (IS_ERR(clk)) { - dev_err(dev, "failed to get clock %s\n", name); continue; }