diff options
| author | Micky Ching <micky_ching@realsil.com.cn> | 2015-01-13 22:09:12 -0500 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-01-21 07:58:44 -0500 |
| commit | be186ad5826ab6a06b585802dd5052d9674699ac (patch) | |
| tree | a6a6736f50aed83038ee9e871a6dd685c32f598f | |
| parent | b22217f966f585b69c823e0f525ee044e13d7976 (diff) | |
mmc: rtsx: check sg_count before long data xfer
Check sg_count before sending long data xfer.
Because dma_map_sg() return int, and sg_count may be negative,
so using int instead of unsigned.
Signed-off-by: Micky Ching <micky_ching@realsil.com.cn>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
| -rw-r--r-- | drivers/mmc/host/rtsx_pci_sdmmc.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c index b435806dd9f3..1d3d6c4bfdc6 100644 --- a/drivers/mmc/host/rtsx_pci_sdmmc.c +++ b/drivers/mmc/host/rtsx_pci_sdmmc.c | |||
| @@ -54,9 +54,9 @@ struct realtek_pci_sdmmc { | |||
| 54 | #define SDMMC_POWER_ON 1 | 54 | #define SDMMC_POWER_ON 1 |
| 55 | #define SDMMC_POWER_OFF 0 | 55 | #define SDMMC_POWER_OFF 0 |
| 56 | 56 | ||
| 57 | unsigned int sg_count; | 57 | int sg_count; |
| 58 | s32 cookie; | 58 | s32 cookie; |
| 59 | unsigned int cookie_sg_count; | 59 | int cookie_sg_count; |
| 60 | bool using_cookie; | 60 | bool using_cookie; |
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| @@ -557,6 +557,13 @@ static int sd_rw_multi(struct realtek_pci_sdmmc *host, struct mmc_request *mrq) | |||
| 557 | { | 557 | { |
| 558 | struct mmc_data *data = mrq->data; | 558 | struct mmc_data *data = mrq->data; |
| 559 | 559 | ||
| 560 | if (host->sg_count < 0) { | ||
| 561 | data->error = host->sg_count; | ||
| 562 | dev_dbg(sdmmc_dev(host), "%s: sg_count = %d is invalid\n", | ||
| 563 | __func__, host->sg_count); | ||
| 564 | return data->error; | ||
| 565 | } | ||
| 566 | |||
| 560 | if (data->flags & MMC_DATA_READ) | 567 | if (data->flags & MMC_DATA_READ) |
| 561 | return sd_read_long_data(host, mrq); | 568 | return sd_read_long_data(host, mrq); |
| 562 | 569 | ||