From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754308Ab3I1Nzh (ORCPT ); Sat, 28 Sep 2013 09:55:37 -0400 Received: from mail.sigma-star.at ([95.130.255.111]:62410 "EHLO mail.sigma-star.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753604Ab3I1Nza (ORCPT ); Sat, 28 Sep 2013 09:55:30 -0400 From: Richard Weinberger To: dedekind1@gmail.com Cc: richard.genoud@gmail.com, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, Richard Weinberger Subject: [PATCH 2/7] UBI: Fix error path in scan_pool() Date: Sat, 28 Sep 2013 15:55:11 +0200 Message-Id: <1380376516-30144-3-git-send-email-richard@nod.at> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1380376516-30144-1-git-send-email-richard@nod.at> References: <1380376516-30144-1-git-send-email-richard@nod.at> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have to set "ret", not "err" in case of an error. Reported-and-tested-by: Richard Genoud Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/fastmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index f5aa4b0..9b42add 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -428,7 +428,7 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai, if (be32_to_cpu(ech->image_seq) != ubi->image_seq) { ubi_err("bad image seq: 0x%x, expected: 0x%x", be32_to_cpu(ech->image_seq), ubi->image_seq); - err = UBI_BAD_FASTMAP; + ret = UBI_BAD_FASTMAP; goto out; } -- 1.8.3.1