diff for duplicates of <51BFD0C0.4080908@renesas.com> diff --git a/a/1.txt b/N1/1.txt index d02fc1e..d3bf1af 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -36,7 +36,7 @@ index 8ef5efa..8f66532 100644 @@ -802,7 +804,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) @@ -80,7 +80,7 @@ index 8ef5efa..8f66532 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; @@ -90,7 +90,7 @@ index 8ef5efa..8f66532 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; @@ -103,8 +103,7 @@ index 8ef5efa..8f66532 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) */ @@ -117,7 +116,7 @@ index 8ef5efa..8f66532 100644 } } -+ if ((mrq->cmd->opcode == MMC_SET_BLOCK_COUNT) && !mrq->cmd->error) { ++ if ((mrq->cmd->opcode = MMC_SET_BLOCK_COUNT) && !mrq->cmd->error) { + /* Send the original .request() command */ + host->mrq = host->mrq_orig; + sh_mmcif_start_cmd(host, host->mrq); diff --git a/a/content_digest b/N1/content_digest index 7af29e4..8baa9b3 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 v2] mmc: sh_mmcif: add SET_BLOCK_COUNT support\0" - "Date\0Tue, 18 Jun 2013 12:15:12 +0900\0" + "Date\0Tue, 18 Jun 2013 03:15:12 +0000\0" "To\0cjb@laptop.org\0" "Cc\0linux-mmc@vger.kernel.org" SH-Linux <linux-sh@vger.kernel.org> @@ -45,7 +45,7 @@ "@@ -802,7 +804,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" @@ -89,7 +89,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" @@ -99,7 +99,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" @@ -112,8 +112,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" @@ -126,7 +125,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\t/* Send the original .request() command */\n" "+\t\thost->mrq = host->mrq_orig;\n" "+\t\tsh_mmcif_start_cmd(host, host->mrq);\n" @@ -140,4 +139,4 @@ "-- \n" 1.7.1 -d5161d6c52de5bd42eb4fb090ec2a5e087f000024deefd161a1a4ab85889ddad +2d0ca624af7f4a977002cb43db817eccdaa2a8fdb9287865a97755c71b4e7b2c
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.