From c0be85f3320f8ed0f35a8aaef194575fbd775f4b Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Wed, 12 Dec 2012 15:38:13 +0100 Subject: [PATCH] --- yaml --- r: 358647 b: refs/heads/master c: 99eb9d8df996fc1695d4de687873875fbd8f6719 h: refs/heads/master i: 358645: fffade5f0119d35a8e6f2e150c53db9a6dec2c6a 358643: cb14072e0c06768dd69be0d566399d5a96e54236 358639: 47bc829f08414606042a85c6b4d65de19c69e86e v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sh_mmcif.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 05bf916c4b9e..1cee737e65bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eae309836509496c981ceaebdef57041de86ecd4 +refs/heads/master: 99eb9d8df996fc1695d4de687873875fbd8f6719 diff --git a/trunk/drivers/mmc/host/sh_mmcif.c b/trunk/drivers/mmc/host/sh_mmcif.c index 8aa7b0e6dec2..de4b6d073599 100644 --- a/trunk/drivers/mmc/host/sh_mmcif.c +++ b/trunk/drivers/mmc/host/sh_mmcif.c @@ -542,10 +542,7 @@ static bool sh_mmcif_next_block(struct sh_mmcif_host *host, u32 *p) host->pio_ptr = p; } - if (host->sg_idx == data->sg_len) - return false; - - return true; + return host->sg_idx != data->sg_len; } static void sh_mmcif_single_read(struct sh_mmcif_host *host, @@ -1071,9 +1068,7 @@ static bool sh_mmcif_end_cmd(struct sh_mmcif_host *host) if (!host->dma_active) { data->error = sh_mmcif_data_trans(host, host->mrq, cmd->opcode); - if (!data->error) - return true; - return false; + return !data->error; } /* Running in the IRQ thread, can sleep */