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>
This commit is contained in:
parent
46bc5c408e
commit
8cb6ed17eb
|
@ -1152,7 +1152,7 @@ static int mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
|
||||||
|
|
||||||
if (!mmc_can_erase(card)) {
|
if (!mmc_can_erase(card)) {
|
||||||
err = -EOPNOTSUPP;
|
err = -EOPNOTSUPP;
|
||||||
goto out;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
from = blk_rq_pos(req);
|
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;
|
goto retry;
|
||||||
if (!err)
|
if (!err)
|
||||||
mmc_blk_reset_success(md, type);
|
mmc_blk_reset_success(md, type);
|
||||||
|
fail:
|
||||||
blk_end_request(req, err, blk_rq_bytes(req));
|
blk_end_request(req, err, blk_rq_bytes(req));
|
||||||
|
|
||||||
return err ? 0 : 1;
|
return err ? 0 : 1;
|
||||||
|
|
Loading…
Reference in New Issue