From c765d8c91acb8e94f76b589aeaa54641f59c81df Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Fri, 10 Mar 2006 19:04:38 +0100 Subject: [PATCH] --- yaml --- r: 25237 b: refs/heads/master c: c9d1a0b8d52e7539e22f3c3190f8b6e0c80b6cfe h: refs/heads/master i: 25235: a3f4314b26e6bbb675b691c446b7bc1c354b7593 v: v3 --- [refs] | 2 +- trunk/drivers/char/watchdog/pcwd_usb.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 28898c3bccfe..17e6cdee438b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bbc20bc0b5d9c5a351fb3a027e60e396c1329a6 +refs/heads/master: c9d1a0b8d52e7539e22f3c3190f8b6e0c80b6cfe diff --git a/trunk/drivers/char/watchdog/pcwd_usb.c b/trunk/drivers/char/watchdog/pcwd_usb.c index 2700c5c45b8a..3fdfda9324fa 100644 --- a/trunk/drivers/char/watchdog/pcwd_usb.c +++ b/trunk/drivers/char/watchdog/pcwd_usb.c @@ -705,7 +705,8 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi 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; }