diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 13:01:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 13:01:11 -0700 |
| commit | 7f344f0aa7d4ec0e4c1c676329aff1353f90fb38 (patch) | |
| tree | 955347ebf22af5f7479ea9b01e8e8f14c2c426c0 /drivers/char/watchdog/pcwd_usb.c | |
| parent | 63589ed0785ffc715777a54ccb96cdfaea9edbc0 (diff) | |
| parent | 853807fb500a9442d88646b7be92bfa51334f8e8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] at91_wdt.c - Atmel AT91RM9200 watchdog driver
[WATCHDOG] pcwd_usb.c: fix a NULL pointer dereference
[WATCHDOG] pcwd.c sprintf/strcpy fix
[WATCHDOG] pcwd.c general clean-up after patches
[WATCHDOG] pcwd.c add debug info
[WATCHDOG] pcwd.c pcwd_cleanup_module patch
[WATCHDOG] pcwd.c firmware-info patch
[WATCHDOG] pcwd.c control status patch
Diffstat (limited to 'drivers/char/watchdog/pcwd_usb.c')
| -rw-r--r-- | drivers/char/watchdog/pcwd_usb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/watchdog/pcwd_usb.c b/drivers/char/watchdog/pcwd_usb.c index 2700c5c45b8a..3fdfda9324fa 100644 --- a/drivers/char/watchdog/pcwd_usb.c +++ b/drivers/char/watchdog/pcwd_usb.c @@ -705,7 +705,8 @@ err_out_misc_deregister: 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; } |