From: George Hilliard <thirtythreeforty@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org,
George Hilliard <thirtythreeforty@gmail.com>
Subject: [PATCH v2 07/11] staging: mt7621-mmc: Check for nonzero number of scatterlist entries
Date: Mon, 18 Mar 2019 20:20:08 -0600 [thread overview]
Message-ID: <20190319022012.11051-8-thirtythreeforty@gmail.com> (raw)
In-Reply-To: <20190319022012.11051-1-thirtythreeforty@gmail.com>
The buffer descriptor setup loop is correct only if it is setting up at
least one bd struct. Besides, there is an error somewhere if
dma_map_sg() returns 0. So add a paranoid check for this condition.
Signed-off-by: George Hilliard <thirtythreeforty@gmail.com>
---
drivers/staging/mt7621-mmc/sd.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index c272aa780719..31c5b44bd29f 100644
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -593,7 +593,12 @@ static void msdc_dma_setup(struct msdc_host *host, struct msdc_dma *dma,
struct bd *bd;
u32 j;
- BUG_ON(sglen > MAX_BD_NUM); /* not support currently */
+ // Shouldn't happen; we configure the mmc host layer
+ // based on MAX_BD_NUM:
+ BUG_ON(sglen > MAX_BD_NUM);
+ // Correct setup below requires at least one bd
+ // (and dma_map_sg should not return 0):
+ BUG_ON(sglen == 0);
gpd = dma->gpd;
bd = dma->bd;
--
2.21.0
next prev parent reply other threads:[~2019-03-19 2:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190319022012.11051-1-thirtythreeforty@gmail.com>
2019-03-19 2:20 ` [PATCH v2 01/11] staging: mt7621-mmc: fix unused variable compiler warning George Hilliard
2019-03-19 2:20 ` [PATCH v2 02/11] staging: mt7621-mmc: Remove obsolete comments and variables George Hilliard
2019-03-19 2:20 ` [PATCH v2 03/11] staging: mt7621-mmc: Fix warning when reloading module with debug msgs enabled George Hilliard
2019-03-20 7:19 ` Greg Kroah-Hartman
2019-03-19 2:20 ` [PATCH v2 04/11] staging: mt7621-mmc: Use pinctrl subsystem to select SDXC pin mode George Hilliard
2019-03-19 2:20 ` [PATCH v2 05/11] staging: mt7621-mmc: Bill the caller for I/O time George Hilliard
2019-03-19 2:20 ` [PATCH v2 06/11] staging: mt7621-mmc: Initialize completions a single time during probe George Hilliard
2019-03-20 7:22 ` Greg Kroah-Hartman
2019-03-19 2:20 ` George Hilliard [this message]
2019-03-20 7:22 ` [PATCH v2 07/11] staging: mt7621-mmc: Check for nonzero number of scatterlist entries Greg Kroah-Hartman
2019-03-19 2:20 ` [PATCH v2 08/11] staging: mt7621-mmc: Remove redundant host->mmc->f_max write George Hilliard
2019-03-19 2:20 ` [PATCH v2 09/11] staging: mt7621-mmc: Immediately notify mmc layer of card change detection George Hilliard
2019-03-19 2:20 ` [PATCH v2 10/11] staging: mt7621-mmc: Fix BRUST -> BURST typo George Hilliard
2019-03-19 2:20 ` [PATCH v2 11/11] staging: mt7621-mmc: Only unmap_sg if mapped George Hilliard
2019-03-20 7:26 ` your mail Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190319022012.11051-8-thirtythreeforty@gmail.com \
--to=thirtythreeforty@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.