diff options
| author | Geert Uytterhoeven | 2016-12-19 15:03:44 +0100 |
|---|---|---|
| committer | Ulf Hansson | 2017-02-13 13:19:53 +0100 |
| commit | 8cb6ed17eb30f190f215031844433981644b064d (patch) | |
| tree | 2c549bf328a09ca58b270fd038fb8928f12d7d4d | |
| parent | mmc: core: Export device lifetime information through sysfs (diff) | |
| download | kernel-qcow2-linux-8cb6ed17eb30f190f215031844433981644b064d.tar.gz kernel-qcow2-linux-8cb6ed17eb30f190f215031844433981644b064d.tar.xz kernel-qcow2-linux-8cb6ed17eb30f190f215031844433981644b064d.zip | |
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>
| -rw-r--r-- | drivers/mmc/core/block.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index cb1698f268f1..5f942a34d65c 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -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 @@ out: goto retry; if (!err) mmc_blk_reset_success(md, type); +fail: blk_end_request(req, err, blk_rq_bytes(req)); return err ? 0 : 1; |