2016-10-13 13:34:15

by Geert Uytterhoeven

Subject: [PATCH] [media] rc: Fix uninitialized variable in debug print

drivers/media/i2c/ir-kbd-i2c.c: In function ‘get_key_haup_common’:
drivers/media/i2c/ir-kbd-i2c.c:120: warning: ‘toggle’ is used uninitialized in this function

To fix this, use the intermediate "toggle" variable, like is done in
other branches.

Fixes: 00bb820755ed8ee9 ("[media] rc: Hauppauge z8f0811 can decode RC6")
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
drivers/media/i2c/ir-kbd-i2c.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c
index f95a6bc839d58f5f..0ab8e226c4cc0d19 100644
--- a/drivers/media/i2c/ir-kbd-i2c.c
+++ b/drivers/media/i2c/ir-kbd-i2c.c
@@ -114,7 +114,8 @@ static int get_key_haup_common(struct IR_i2c *ir, enum rc_type *protocol,
vendor = get_unaligned_be16(buf + 1);

if (vendor == 0x800f) {
- *ptoggle = (dev & 0x80) != 0;
+ toggle = (dev & 0x80) != 0;
+ *ptoggle = toggle;
*protocol = RC_TYPE_RC6_MCE;
dev &= 0x7f;
dprintk(1, "ir hauppauge (rc6-mce): t%d vendor=%d dev=%d code=%d\n",
--
1.9.1

2016-10-13 20:24:35

by Sean Young

Subject: Re: [PATCH] [media] rc: Fix uninitialized variable in debug print

On Thu, Oct 13, 2016 at 12:35:02PM +0200, Geert Uytterhoeven wrote:
> drivers/media/i2c/ir-kbd-i2c.c: In function ‘get_key_haup_common’:
> drivers/media/i2c/ir-kbd-i2c.c:120: warning: ‘toggle’ is used uninitialized in this function
>
> To fix this, use the intermediate "toggle" variable, like is done in
> other branches.
>
> Fixes: 00bb820755ed8ee9 ("[media] rc: Hauppauge z8f0811 can decode RC6")
> Signed-off-by: Geert Uytterhoeven <[email protected]>

Thanks for finding this and writing a patch.

Acked-by: Sean Young <[email protected]>
> ---
> drivers/media/i2c/ir-kbd-i2c.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c
> index f95a6bc839d58f5f..0ab8e226c4cc0d19 100644
> --- a/drivers/media/i2c/ir-kbd-i2c.c
> +++ b/drivers/media/i2c/ir-kbd-i2c.c
> @@ -114,7 +114,8 @@ static int get_key_haup_common(struct IR_i2c *ir, enum rc_type *protocol,
> vendor = get_unaligned_be16(buf + 1);
>
> if (vendor == 0x800f) {
> - *ptoggle = (dev & 0x80) != 0;
> + toggle = (dev & 0x80) != 0;
> + *ptoggle = toggle;
> *protocol = RC_TYPE_RC6_MCE;
> dev &= 0x7f;
> dprintk(1, "ir hauppauge (rc6-mce): t%d vendor=%d dev=%d code=%d\n",
> --
> 1.9.1