Commit 8cb6ed17 authored Dec 19, 2016 by Geert Uytterhoeven Committed by Ulf Hansson Feb 13, 2017

mmc: block: Avoid uninitialized warning in mmc_blk_issue_discard_rq()

With gcc-4.1.2:

mmc/core/block.c: In function ‘mmc_blk_issue_discard_rq’:
mmc/core/block.c:1150: warning: ‘arg’ may be used uninitialized in this function
mmc/core/block.c:1150: warning: ‘nr’ may be used uninitialized in this function
mmc/core/block.c:1150: warning: ‘from’ may be used uninitialized in this function

While this is a false positive, it can be avoided easily by jumping over
the checks for "err" that are always false.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 46bc5c40

drivers/mmc/core/block.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1152,7 +1152,7 @@ static int mmc_blk_issue_discard_rq(struct mmc_queue mq, struct request req)

		if (!mmc_can_erase(card)) {
		err = -EOPNOTSUPP;
		goto out;
		goto fail;
		}

		from = blk_rq_pos(req);
		@@ -1181,6 +1181,7 @@ static int mmc_blk_issue_discard_rq(struct mmc_queue mq, struct request req)
		goto retry;
		if (!err)
		mmc_blk_reset_success(md, type);
		fail:
		blk_end_request(req, err, blk_rq_bytes(req));

		return err ? 0 : 1;