usb/input/keyspan_remote.c: don't use an uninitialized variable
PATCH 1/1 usb/input/keyspan_remote.c: don't use an uninitialized variable
gcc reported the following:
<-- snip -->
...
CC drivers/usb/input/keyspan_remote.odrivers/usb/input/keyspan_remote.c: In function 'keyspan_irq_recv':drivers/usb/input/keyspan_remote.c:186: warning: 'message.toggle' may be used uninitialized in this function
...
<-- snip -->
gcc is right, there is an error case where this actually happens.
What about this patch that returns in this error case?
Signed-off-by Darren Jenkins <[email protected]>
drivers/usb/input/keyspan_remote.c renamed from drivers/usb/input/keyspan_remote.c.old +1 -0
@@ -285,30 +285,31 @@ static void keyspan_check_data(struct usreturn ; } }keyspan_load_tester (remote,6 );if ((remote->data.tester &ZERO_MASK ) ==ZERO ) { message.toggle =0 ; remote->data.tester = remote->data.tester >>5 ; remote->data.bits_left -=5 ; }else if ((remote->data.tester &ONE_MASK ) ==ONE ) { message.toggle =1 ; remote->data.tester = remote->data.tester >>6 ; remote->data.bits_left -=6 ; }else {err ("%s - Error in message, invalid toggle.\n" , __FUNCTION__); +return ; }keyspan_load_tester (remote,5 );if ((remote->data.tester &STOP_MASK ) ==STOP ) { remote->data.tester = remote->data.tester >>5 ; remote->data.bits_left -=5 ; }else {err ("Bad message recieved, no stop bit found.\n" ); }dev_dbg (&remote->udev->dev,"%s found valid message: system: %d, button: %d, toggle: %d\n" , __FUNCTION__, message.system, message.button, message.toggle);if (message.toggle != remote->toggle) {
Quoted 3 lines · Adrian Bunk
...
Signed-off-by Darren Jenkins <[email protected]>...
Cut'n'paste error of the year...
Darren Jenkins was in no way involved with this patch, this should have been:
Signed-off-by Adrian Bunk <[email protected]>
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed