diff mbox

UBI: fastmap: correct error check

Message ID 1400650538-11234-1-git-send-email-computersforpeace@gmail.com
State Accepted
Headers show

Commit Message

Brian Norris May 21, 2014, 5:35 a.m. UTC
The return value from ubi_io_read_ec_hdr() was stored in 'err', not in
'ret'.

This issue was reported by Coverity Scan.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
---
 drivers/mtd/ubi/fastmap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Richard Weinberger May 21, 2014, 7:29 a.m. UTC | #1
Am 21.05.2014 07:35, schrieb Brian Norris:
> The return value from ubi_io_read_ec_hdr() was stored in 'err', not in
> 'ret'.
> 
> This issue was reported by Coverity Scan.

I begin to love Coverity. :-)
Thanks for the patch, Brian!

> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> Cc: Richard Weinberger <richard@nod.at>

Acked-by: Richard Weinberger <richard@nod.at>

Thanks,
//richard
Brian Norris June 9, 2014, 5:01 p.m. UTC | #2
Hi Artem,

On Wed, May 21, 2014 at 09:29:32AM +0200, Richard Weinberger wrote:
> Am 21.05.2014 07:35, schrieb Brian Norris:
> > The return value from ubi_io_read_ec_hdr() was stored in 'err', not in
> > 'ret'.
> > 
> > This issue was reported by Coverity Scan.
> 
> I begin to love Coverity. :-)
> Thanks for the patch, Brian!
> 
> > Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> > Cc: Richard Weinberger <richard@nod.at>
> 
> Acked-by: Richard Weinberger <richard@nod.at>

Ping.

Brian
Artem Bityutskiy June 10, 2014, 6:56 a.m. UTC | #3
On Mon, 2014-06-09 at 10:01 -0700, Brian Norris wrote:
> Hi Artem,
> 
> On Wed, May 21, 2014 at 09:29:32AM +0200, Richard Weinberger wrote:
> > Am 21.05.2014 07:35, schrieb Brian Norris:
> > > The return value from ubi_io_read_ec_hdr() was stored in 'err', not in
> > > 'ret'.
> > > 
> > > This issue was reported by Coverity Scan.
> > 
> > I begin to love Coverity. :-)
> > Thanks for the patch, Brian!
> > 
> > > Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> > > Cc: Richard Weinberger <richard@nod.at>
> > 
> > Acked-by: Richard Weinberger <richard@nod.at>
> 
> Ping.

Ooops, missed this completely. Let me merge it a bit later, after
3.16-rc1. Thanks!
Brian Norris July 9, 2014, 1:58 a.m. UTC | #4
Hi Artem,

On Tue, Jun 10, 2014 at 09:56:12AM +0300, Artem Bityutskiy wrote:
> On Mon, 2014-06-09 at 10:01 -0700, Brian Norris wrote:
> > On Wed, May 21, 2014 at 09:29:32AM +0200, Richard Weinberger wrote:
> > > Am 21.05.2014 07:35, schrieb Brian Norris:
> > > > The return value from ubi_io_read_ec_hdr() was stored in 'err', not in
> > > > 'ret'.
> > > > 
> > > > This issue was reported by Coverity Scan.
> > > 
> > > I begin to love Coverity. :-)
> > > Thanks for the patch, Brian!
> > > 
> > > > Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> > > > Cc: Richard Weinberger <richard@nod.at>
> > > 
> > > Acked-by: Richard Weinberger <richard@nod.at>
> > 
> > Ping.
> 
> Ooops, missed this completely. Let me merge it a bit later, after
> 3.16-rc1. Thanks!

'Tis after 3.16-rc1!

Brian
Artem Bityutskiy July 16, 2014, 5:34 a.m. UTC | #5
On Tue, 2014-07-08 at 18:58 -0700, Brian Norris wrote:
> > Ooops, missed this completely. Let me merge it a bit later, after
> > 3.16-rc1. Thanks!
> 
> 'Tis after 3.16-rc1!

I'll send a pull request today/tomorrow, just returned from vacation.
diff mbox

Patch

diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index c5dad652614d..6de0e10fcea3 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -423,7 +423,7 @@  static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai,
 				pnum, err);
 			ret = err > 0 ? UBI_BAD_FASTMAP : err;
 			goto out;
-		} else if (ret == UBI_IO_BITFLIPS)
+		} else if (err == UBI_IO_BITFLIPS)
 			scrub = 1;
 
 		/*