commit c9d1a0b8d52e7539e22f3c3190f8b6e0c80b6cfe
author Adrian Bunk <bunk@stusta.de> Fri Mar 10 19:04:38 2006 +0100
committer Wim Van Sebroeck <wim@iguana.be> Sun Apr 02 18:51:50 2006 +0200
tree ea27a7a0e334f925eb6e42fb060d252c8439166a
parent 6bbc20bc0b5d9c5a351fb3a027e60e396c1329a6

[WATCHDOG] pcwd_usb.c: fix a NULL pointer dereference

The Coverity checker noted that this resulted in a NULL pointer
reference if we were coming from

        if (usb_pcwd == NULL) {
                printk(KERN_ERR PFX "Out of memory\n");
                    goto error;
        }

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>

drivers/char/watchdog/pcwd_usb.c

diff --git a/drivers/char/watchdog/pcwd_usb.c b/drivers/char/watchdog/pcwd_usb.c
index 2700c5c..3fdfda93 100644
--- a/drivers/char/watchdog/pcwd_usb.c
+++ b/drivers/char/watchdog/pcwd_usb.c
@@ -705,7 +705,8 @@
 err_out_unregister_reboot:
 	unregister_reboot_notifier(&usb_pcwd_notifier);
 error:
-	usb_pcwd_delete (usb_pcwd);
+	if (usb_pcwd)
+		usb_pcwd_delete(usb_pcwd);
 	usb_pcwd_device = NULL;
 	return retval;
 }