| Message ID | 1482156225-32517-1-git-send-email-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 19 December 2016 at 15:03, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > 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> Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/core/block.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c > index bab3f07b1117ea81..8c0e0833d481cf94 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 @@ 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; > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index bab3f07b1117ea81..8c0e0833d481cf94 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 @@ 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;
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> --- drivers/mmc/core/block.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)