mfd: fix check on unsigned in twl4030_configure_resource()
Subsystems (2)
PATCH 1/1 mfd: fix check on unsigned in twl4030_configure_resource()
struct twl4030_resconfig members devgroup, type and type2 are unsigned.
Signed-off-by Roel Kluin <[email protected]>
---
`git grep devgroup' and notice that these are initialized to -1 in arch/arm/mach-omap2/board-rx51-peripherals.c:383-397
Is this the right fix?
drivers/mfd/twl4030-power.c +3 -3
@@ -335,7 +335,7 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)return err; } -if (rconfig->devgroup >=0 ) { +if (rconfig->devgroup !=-1 ) { grp &= ~DEVGROUP_MASK ; grp |= rconfig->devgroup <<DEVGROUP_SHIFT ; err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
@@ -355,12 +355,12 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)return err; } -if (rconfig->type >=0 ) { +if (rconfig->type !=-1 ) { type &= ~TYPE_MASK ; type |= rconfig->type <<TYPE_SHIFT ; } -if (rconfig->type2 >=0 ) { +if (rconfig->type2 !=-1 ) { type &= ~TYPE2_MASK ; type |= rconfig->type2 <<TYPE2_SHIFT ; }
Quoted 9 lines · Roel Kluin
struct
twl4030_resconfigmembers devgroup, type and type2 are unsigned.Signed-off-by Roel Kluin <[email protected]>---
`git grep devgroup' and notice that these are initialized to -1 in arch/arm/mach-omap2/board-rx51-peripherals.c:383-397Is this the right fix?
Yes it is. Aaro beat you to it though [1] :)
Regards,
Amit
Quoted 29 lines
drivers/mfd/twl4030-power.c +3
-3@@ -335,7 +335,7 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig) return err; } - if (rconfig->devgroup >= 0) { + if (rconfig->devgroup != -1) { grp &= ~DEVGROUP_MASK; grp |= rconfig->devgroup << DEVGROUP_SHIFT; err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,@@ -355,12 +355,12 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig) return err; } - if (rconfig->type >= 0) { + if (rconfig->type != -1) { type &= ~TYPE_MASK; type |= rconfig->type << TYPE_SHIFT; } - if (rconfig->type2 >= 0) { + if (rconfig->type2 != -1) { type &= ~TYPE2_MASK; type |= rconfig->type2 << TYPE2_SHIFT; }