diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:56:17 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:56:17 +0000 |
| commit | 7a09266c69e2a0791334600c1ce72200bb679446 (patch) | |
| tree | bc6e7c7e8632d0f153b1c9436665829921a57ecf /drivers/mmc/host/sdhci-s3c.c | |
| parent | 4eb821999086417ab42a15174b51497122fc406e (diff) | |
| parent | 4346b6d9c6651121f35ae9e42f240f36a8e56ce6 (diff) | |
| download | talos-obmc-linux-7a09266c69e2a0791334600c1ce72200bb679446.tar.gz talos-obmc-linux-7a09266c69e2a0791334600c1ce72200bb679446.zip | |
Merge branch 'next-samsung-cleanup-mmc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/cleanup
Diffstat (limited to 'drivers/mmc/host/sdhci-s3c.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-s3c.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index cb60c4197e0a..6b3f3664edeb 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/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; } |
