diff for duplicates of <51B97CDB.7010207@renesas.com> diff --git a/a/1.txt b/N1/1.txt index d5e33d4..d0ff11b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ index 8ef5efa..14d4c81 100644 @@ -802,7 +803,11 @@ static u32 sh_mmcif_set_cmd(struct sh_mmcif_host *host, tmp |= CMD_SET_DWEN; /* CMLTE/CMD12EN */ - if (opc == MMC_READ_MULTIPLE_BLOCK || opc == MMC_WRITE_MULTIPLE_BLOCK) { + if (opc = MMC_READ_MULTIPLE_BLOCK || opc = MMC_WRITE_MULTIPLE_BLOCK) { - tmp |= CMD_SET_CMLTE | CMD_SET_CMD12EN; + /* If SBC, we don't use CMD12(STOP) */ + if (mrq->sbc) @@ -95,7 +95,7 @@ index 8ef5efa..14d4c81 100644 sh_mmcif_get_response(host, cmd); -+ if (cmd->opcode == MMC_SET_BLOCK_COUNT) ++ if (cmd->opcode = MMC_SET_BLOCK_COUNT) + complete(&host->sbc_complete); + if (!data) @@ -105,7 +105,7 @@ index 8ef5efa..14d4c81 100644 return IRQ_HANDLED; } -+ if (mrq->sbc && (mrq->cmd->opcode == MMC_WRITE_MULTIPLE_BLOCK) && ++ if (mrq->sbc && (mrq->cmd->opcode = MMC_WRITE_MULTIPLE_BLOCK) && + (host->wait_for != MMCIF_WAIT_FOR_WRITE_END)) { + /* Wait for end of data phase */ + host->wait_for = MMCIF_WAIT_FOR_WRITE_END; @@ -115,7 +115,7 @@ index 8ef5efa..14d4c81 100644 + return IRQ_HANDLED; + } + -+ if (mrq->sbc && (mrq->cmd->opcode == MMC_READ_MULTIPLE_BLOCK) && ++ if (mrq->sbc && (mrq->cmd->opcode = MMC_READ_MULTIPLE_BLOCK) && + (host->wait_for != MMCIF_WAIT_FOR_READ_END)) { + /* Wait for end of data phase */ + host->wait_for = MMCIF_WAIT_FOR_READ_END; @@ -128,8 +128,7 @@ index 8ef5efa..14d4c81 100644 if (host->wait_for != MMCIF_WAIT_FOR_STOP) { struct mmc_data *data = mrq->data; if (!mrq->cmd->error && data && !data->error) - data->bytes_xfered = - data->blocks * data->blksz; + data->bytes_xfered data->blocks * data->blksz; - if (mrq->stop && !mrq->cmd->error && (!data || !data->error)) { + /* If SBC, we don't use CMD12(STOP) */ @@ -142,7 +141,7 @@ index 8ef5efa..14d4c81 100644 } } -+ if ((mrq->cmd->opcode == MMC_SET_BLOCK_COUNT) && !mrq->cmd->error) { ++ if ((mrq->cmd->opcode = MMC_SET_BLOCK_COUNT) && !mrq->cmd->error) { + schedule_delayed_work(&host->timeout_work, host->timeout); + mutex_unlock(&host->thread_lock); + return IRQ_HANDLED; diff --git a/a/content_digest b/N1/content_digest index b8a549d..0d63399 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Shimoda, Yoshihiro <yoshihiro.shimoda.uh@renesas.com>\0" "Subject\0[PATCH] mmc: sh_mmcif: add SET_BLOCK_COUNT support\0" - "Date\0Thu, 13 Jun 2013 17:03:39 +0900\0" + "Date\0Thu, 13 Jun 2013 08:03:39 +0000\0" "To\0cjb@laptop.org\0" "Cc\0linux-mmc@vger.kernel.org" SH-Linux <linux-sh@vger.kernel.org> @@ -34,7 +34,7 @@ "@@ -802,7 +803,11 @@ static u32 sh_mmcif_set_cmd(struct sh_mmcif_host *host,\n" " \t\ttmp |= CMD_SET_DWEN;\n" " \t/* CMLTE/CMD12EN */\n" - " \tif (opc == MMC_READ_MULTIPLE_BLOCK || opc == MMC_WRITE_MULTIPLE_BLOCK) {\n" + " \tif (opc = MMC_READ_MULTIPLE_BLOCK || opc = MMC_WRITE_MULTIPLE_BLOCK) {\n" "-\t\ttmp |= CMD_SET_CMLTE | CMD_SET_CMD12EN;\n" "+\t\t/* If SBC, we don't use CMD12(STOP) */\n" "+\t\tif (mrq->sbc)\n" @@ -104,7 +104,7 @@ "\n" " \tsh_mmcif_get_response(host, cmd);\n" "\n" - "+\tif (cmd->opcode == MMC_SET_BLOCK_COUNT)\n" + "+\tif (cmd->opcode = MMC_SET_BLOCK_COUNT)\n" "+\t\tcomplete(&host->sbc_complete);\n" "+\n" " \tif (!data)\n" @@ -114,7 +114,7 @@ " \t\treturn IRQ_HANDLED;\n" " \t}\n" "\n" - "+\tif (mrq->sbc && (mrq->cmd->opcode == MMC_WRITE_MULTIPLE_BLOCK) &&\n" + "+\tif (mrq->sbc && (mrq->cmd->opcode = MMC_WRITE_MULTIPLE_BLOCK) &&\n" "+\t\t\t(host->wait_for != MMCIF_WAIT_FOR_WRITE_END)) {\n" "+\t\t/* Wait for end of data phase */\n" "+\t\thost->wait_for = MMCIF_WAIT_FOR_WRITE_END;\n" @@ -124,7 +124,7 @@ "+\t\treturn IRQ_HANDLED;\n" "+\t}\n" "+\n" - "+\tif (mrq->sbc && (mrq->cmd->opcode == MMC_READ_MULTIPLE_BLOCK) &&\n" + "+\tif (mrq->sbc && (mrq->cmd->opcode = MMC_READ_MULTIPLE_BLOCK) &&\n" "+\t\t\t(host->wait_for != MMCIF_WAIT_FOR_READ_END)) {\n" "+\t\t/* Wait for end of data phase */\n" "+\t\thost->wait_for = MMCIF_WAIT_FOR_READ_END;\n" @@ -137,8 +137,7 @@ " \tif (host->wait_for != MMCIF_WAIT_FOR_STOP) {\n" " \t\tstruct mmc_data *data = mrq->data;\n" " \t\tif (!mrq->cmd->error && data && !data->error)\n" - " \t\t\tdata->bytes_xfered =\n" - " \t\t\t\tdata->blocks * data->blksz;\n" + " \t\t\tdata->bytes_xfered \t\t\t\tdata->blocks * data->blksz;\n" "\n" "-\t\tif (mrq->stop && !mrq->cmd->error && (!data || !data->error)) {\n" "+\t\t/* If SBC, we don't use CMD12(STOP) */\n" @@ -151,7 +150,7 @@ " \t\t}\n" " \t}\n" "\n" - "+\tif ((mrq->cmd->opcode == MMC_SET_BLOCK_COUNT) && !mrq->cmd->error) {\n" + "+\tif ((mrq->cmd->opcode = MMC_SET_BLOCK_COUNT) && !mrq->cmd->error) {\n" "+\t\tschedule_delayed_work(&host->timeout_work, host->timeout);\n" "+\t\tmutex_unlock(&host->thread_lock);\n" "+\t\treturn IRQ_HANDLED;\n" @@ -171,4 +170,4 @@ "-- \n" 1.7.1 -9843b43536b5530621978e5bae86ba0952f981740c66bec6adc6aeadc7662f3b +fd39ebfa5a6f1fbae365ecdf3e130beee3c5168a16cd88717a67feba84b58be2
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.