diff mbox

[V2] ubi: fix swapped arguments to call to ubi_alloc_aeb

Message ID 20161015160011.27600-1-colin.king@canonical.com
State Accepted
Headers show

Commit Message

Colin Ian King Oct. 15, 2016, 4 p.m. UTC
From: Colin Ian King <colin.king@canonical.com>

Static analysis by CoverityScan detected the ec and pnum
arguments are in the wrong order on a call to ubi_alloc_aeb.
Swap the order to fix this.

Fixes: 91f4285fe389a27 ("UBI: provide helpers to allocate and free aeb elements")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/mtd/ubi/fastmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Boris Brezillon Oct. 16, 2016, 3:38 p.m. UTC | #1
On Sat, 15 Oct 2016 17:00:11 +0100
Colin King <colin.king@canonical.com> wrote:

> From: Colin Ian King <colin.king@canonical.com>
> 
> Static analysis by CoverityScan detected the ec and pnum
> arguments are in the wrong order on a call to ubi_alloc_aeb.
> Swap the order to fix this.
> 
> Fixes: 91f4285fe389a27 ("UBI: provide helpers to allocate and free aeb elements")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>

> ---
>  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 d6384d9..4eed546 100644
> --- a/drivers/mtd/ubi/fastmap.c
> +++ b/drivers/mtd/ubi/fastmap.c
> @@ -287,7 +287,7 @@ static int update_vol(struct ubi_device *ubi, struct ubi_attach_info *ai,
>  
>  		/* new_aeb is newer */
>  		if (cmp_res & 1) {
> -			victim = ubi_alloc_aeb(ai, aeb->ec, aeb->pnum);
> +			victim = ubi_alloc_aeb(ai, aeb->pnum, aeb->ec);
>  			if (!victim)
>  				return -ENOMEM;
>
Richard Weinberger Oct. 18, 2016, 7:25 p.m. UTC | #2
On 16.10.2016 17:38, Boris Brezillon wrote:
> On Sat, 15 Oct 2016 17:00:11 +0100
> Colin King <colin.king@canonical.com> wrote:
> 
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> Static analysis by CoverityScan detected the ec and pnum
>> arguments are in the wrong order on a call to ubi_alloc_aeb.
>> Swap the order to fix this.
>>
>> Fixes: 91f4285fe389a27 ("UBI: provide helpers to allocate and free aeb elements")
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> 
> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>

Applied. :)

Thanks,
//richard
diff mbox

Patch

diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index d6384d9..4eed546 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -287,7 +287,7 @@  static int update_vol(struct ubi_device *ubi, struct ubi_attach_info *ai,
 
 		/* new_aeb is newer */
 		if (cmp_res & 1) {
-			victim = ubi_alloc_aeb(ai, aeb->ec, aeb->pnum);
+			victim = ubi_alloc_aeb(ai, aeb->pnum, aeb->ec);
 			if (!victim)
 				return -ENOMEM;