mmc: remove BYTEBLOCK capability

Remove the BYTEBLOCK capability and let the broken hosts fail the
requests with -EINVAL instead.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index d53e9a8bdaa2..4a72772f4fe4 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -391,6 +391,14 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 
         WARN_ON(host->mrq != NULL);
 
+        if (mrq->data && (hweight32(mrq->data->blksz) > 1)) {
+                printk(KERN_ERR "%s: Unsupported block size (%d bytes)\n",
+                        mmc_hostname(mmc), mrq->data->blksz);
+                mrq->cmd->error = -EINVAL;
+                mmc_request_done(mmc, mrq);
+                return;
+        }
+
         spin_lock_irq(&host->lock);
 
         host->mrq = mrq;