summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorJan Glauber <jglauber@cavium.com>2017-04-13 14:10:51 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2017-04-24 21:42:23 +0200
commitfe79018aa4c3af7d74e48b9a9b117da9fb6cf353 (patch)
tree972b6c4575c779ee3853f0381a25139a5ad5f2e4 /drivers/mmc
parentc34d1579de4665d9613691bc37aebb7ca86d535d (diff)
downloadop-kernel-dev-fe79018aa4c3af7d74e48b9a9b117da9fb6cf353.zip
op-kernel-dev-fe79018aa4c3af7d74e48b9a9b117da9fb6cf353.tar.gz
mmc: cavium: Check pointer before de-reference
Add a pointer check to prevent this smatch warning: drivers/mmc/host/cavium.c:803 cvm_mmc_request() error: we previously assumed 'cmd->data' could be null (see line 782) This is a theoretical fix because MMC_CMD_ADTC seems to imply that cmd->data is not null. Nevertheless checking cmd->data before using it improves readability. Signed-off-by: Jan Glauber <jglauber@cavium.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/cavium.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/cavium.c b/drivers/mmc/host/cavium.c
index ddf902c..d89c2eb 100644
--- a/drivers/mmc/host/cavium.c
+++ b/drivers/mmc/host/cavium.c
@@ -799,7 +799,7 @@ static void cvm_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
FIELD_PREP(MIO_EMM_CMD_IDX, cmd->opcode) |
FIELD_PREP(MIO_EMM_CMD_ARG, cmd->arg);
set_bus_id(&emm_cmd, slot->bus_id);
- if (mmc_cmd_type(cmd) == MMC_CMD_ADTC)
+ if (cmd->data && mmc_cmd_type(cmd) == MMC_CMD_ADTC)
emm_cmd |= FIELD_PREP(MIO_EMM_CMD_OFFSET,
64 - ((cmd->data->blocks * cmd->data->blksz) / 8));
OpenPOWER on IntegriCloud