| From 028b6f9e2b0adc8c6f75a05fcbdd0e66345bb708 Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Tue, 14 Mar 2017 11:09:18 +0100 |
| Subject: [PATCH 119/286] mmc: host: tmio: don't BUG on unsupported stop |
| commands |
| |
| Halting the kernel on an unsupported stop command seems overkill, report |
| the error and say what we already did (due to autocmd12) instead. |
| |
| Reviewed-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| (cherry picked from commit 022f731e03d190d0e4f52f2b1bd90fae0eadd56d) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/tmio_mmc_pio.c | 9 +++++---- |
| 1 file changed, 5 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/mmc/host/tmio_mmc_pio.c |
| +++ b/drivers/mmc/host/tmio_mmc_pio.c |
| @@ -553,10 +553,11 @@ void tmio_mmc_do_data_irq(struct tmio_mm |
| } |
| |
| if (stop) { |
| - if (stop->opcode == MMC_STOP_TRANSMISSION && !stop->arg) |
| - sd_ctrl_write16(host, CTL_STOP_INTERNAL_ACTION, 0); |
| - else |
| - BUG(); |
| + if (stop->opcode != MMC_STOP_TRANSMISSION || stop->arg) |
| + dev_err(&host->pdev->dev, "unsupported stop: CMD%u,0x%x. We did CMD12,0\n", |
| + stop->opcode, stop->arg); |
| + |
| + sd_ctrl_write16(host, CTL_STOP_INTERNAL_ACTION, 0); |
| } |
| |
| schedule_work(&host->done); |
