diff options
| author | John Crispin <john@openwrt.org> | 2015-12-17 09:29:22 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-12-17 09:29:22 +0000 |
| commit | d4b8d51580f61bc242b3a51566d2e4afd1f4a150 (patch) | |
| tree | 16c7b79fae4831e85c1239d0da5869893f7b65fa /target/linux/brcm2708/patches-4.1/0222-bcm2835-sdhost-Don-t-log-timeout-errors-unless-debug.patch | |
| parent | 98bf3d41207f32bc14ca8b67435ddc75e93b8214 (diff) | |
| download | upstream-d4b8d51580f61bc242b3a51566d2e4afd1f4a150.tar.gz upstream-d4b8d51580f61bc242b3a51566d2e4afd1f4a150.tar.bz2 upstream-d4b8d51580f61bc242b3a51566d2e4afd1f4a150.zip | |
brcm2708: update 4.1 patches
As usual, this patches were taken (and rebased) from
https://github.com/raspberrypi/linux/commits/rpi-4.1.y
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 47922
Diffstat (limited to 'target/linux/brcm2708/patches-4.1/0222-bcm2835-sdhost-Don-t-log-timeout-errors-unless-debug.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.1/0222-bcm2835-sdhost-Don-t-log-timeout-errors-unless-debug.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.1/0222-bcm2835-sdhost-Don-t-log-timeout-errors-unless-debug.patch b/target/linux/brcm2708/patches-4.1/0222-bcm2835-sdhost-Don-t-log-timeout-errors-unless-debug.patch new file mode 100644 index 0000000000..58c18b3231 --- /dev/null +++ b/target/linux/brcm2708/patches-4.1/0222-bcm2835-sdhost-Don-t-log-timeout-errors-unless-debug.patch @@ -0,0 +1,43 @@ +From 190044f7b7a0b06d46de345f9c79f7991051b68d Mon Sep 17 00:00:00 2001 +From: Phil Elwell <phil@raspberrypi.org> +Date: Wed, 9 Dec 2015 11:38:15 +0000 +Subject: [PATCH 222/222] bcm2835-sdhost: Don't log timeout errors unless + debug=1 + +The MMC card-discovery process generates timeouts. This is +expected behaviour, so reporting it to the user serves no purpose. +Suppress the reporting of timeout errors unless the debug flag +is on. +--- + drivers/mmc/host/bcm2835-sdhost.c | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +--- a/drivers/mmc/host/bcm2835-sdhost.c ++++ b/drivers/mmc/host/bcm2835-sdhost.c +@@ -966,19 +966,15 @@ static void bcm2835_sdhost_finish_comman + mmc_hostname(host->mmc)); + } else { + if (sdhsts & SDHSTS_CMD_TIME_OUT) { +- switch (host->cmd->opcode) { +- case 5: case 52: case 53: +- /* Don't warn about SDIO commands */ +- break; +- default: +- pr_err("%s: command timeout\n", +- mmc_hostname(host->mmc)); +- break; +- } ++ if (host->debug) ++ pr_err("%s: command %d timeout\n", ++ mmc_hostname(host->mmc), ++ host->cmd->opcode); + host->cmd->error = -ETIMEDOUT; + } else { +- pr_err("%s: unexpected command error\n", +- mmc_hostname(host->mmc)); ++ pr_err("%s: unexpected command %d error\n", ++ mmc_hostname(host->mmc), ++ host->cmd->opcode); + bcm2835_sdhost_dumpregs(host); + host->cmd->error = -EIO; + } |