diff options
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
-rw-r--r-- | drivers/mmc/host/sdhci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 6b2d1f99af67..f52f3053ed92 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c | |||
@@ -1636,8 +1636,7 @@ int sdhci_add_host(struct sdhci_host *host) | |||
1636 | mmc->f_max = host->max_clk; | 1636 | mmc->f_max = host->max_clk; |
1637 | mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ; | 1637 | mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ; |
1638 | 1638 | ||
1639 | if ((caps & SDHCI_CAN_DO_HISPD) || | 1639 | if (caps & SDHCI_CAN_DO_HISPD) |
1640 | (host->quirks & SDHCI_QUIRK_FORCE_HIGHSPEED)) | ||
1641 | mmc->caps |= MMC_CAP_SD_HIGHSPEED; | 1640 | mmc->caps |= MMC_CAP_SD_HIGHSPEED; |
1642 | 1641 | ||
1643 | mmc->ocr_avail = 0; | 1642 | mmc->ocr_avail = 0; |
@@ -1723,7 +1722,9 @@ int sdhci_add_host(struct sdhci_host *host) | |||
1723 | #endif | 1722 | #endif |
1724 | 1723 | ||
1725 | #ifdef SDHCI_USE_LEDS_CLASS | 1724 | #ifdef SDHCI_USE_LEDS_CLASS |
1726 | host->led.name = mmc_hostname(mmc); | 1725 | snprintf(host->led_name, sizeof(host->led_name), |
1726 | "%s::", mmc_hostname(mmc)); | ||
1727 | host->led.name = host->led_name; | ||
1727 | host->led.brightness = LED_OFF; | 1728 | host->led.brightness = LED_OFF; |
1728 | host->led.default_trigger = mmc_hostname(mmc); | 1729 | host->led.default_trigger = mmc_hostname(mmc); |
1729 | host->led.brightness_set = sdhci_led_control; | 1730 | host->led.brightness_set = sdhci_led_control; |