diff options
| author | Rui Miguel Silva <rui.silva@linaro.org> | 2015-07-02 19:11:35 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2015-07-06 11:15:42 -0700 |
| commit | 73f4a5217968d51d9685732512d268c71b78a347 (patch) | |
| tree | 7a02736f51756cbc7f2728459804314a94f0af7a /drivers/staging/greybus/sdio.c | |
| parent | 882edf59fcfa400547bdb509e67f2266471f838d (diff) | |
| download | linux-73f4a5217968d51d9685732512d268c71b78a347.tar.bz2 | |
greybus: sdio: check number of blocks in transfer
Before initiating a transfers, check if the command (for single block)
match the number of blocks in the request.
While at it, fix also a missing break.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/sdio.c')
| -rw-r--r-- | drivers/staging/greybus/sdio.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/staging/greybus/sdio.c b/drivers/staging/greybus/sdio.c index 8e7b7ba341dc..544dbda82460 100644 --- a/drivers/staging/greybus/sdio.c +++ b/drivers/staging/greybus/sdio.c @@ -47,6 +47,14 @@ define_get_version(gb_sdio_host, SDIO); #define GB_SDIO_RSP_R1B (GB_SDIO_RSP_PRESENT | GB_SDIO_RSP_CRC | \ GB_SDIO_RSP_OPCODE | GB_SDIO_RSP_BUSY) +static inline bool single_op(struct mmc_command *cmd) +{ + uint32_t opcode = cmd->opcode; + + return opcode == MMC_WRITE_BLOCK || + opcode == MMC_READ_SINGLE_BLOCK; +} + static void _gb_sdio_set_host_caps(struct gb_sdio_host *host, u32 r) { u32 caps = 0; @@ -292,6 +300,11 @@ static int gb_sdio_transfer(struct gb_sdio_host *host, struct mmc_data *data) int ret = 0; u16 nblocks; + if (single_op(data->mrq->cmd) && data->blocks > 1) { + ret = -ETIMEDOUT; + goto out; + } + left = data->blksz * data->blocks; while (left) { @@ -351,6 +364,7 @@ static int gb_sdio_command(struct gb_sdio_host *host, struct mmc_command *cmd) break; case MMC_RSP_R3: cmd_flags = GB_SDIO_RSP_R3_R4; + break; default: dev_err(mmc_dev(host->mmc), "cmd flag invalid %04x\n", mmc_resp_type(cmd)); |