From baa8ce0a8587b128230966aaa55ebd240e34d1f6 Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Tue, 23 Oct 2007 12:26:41 +0200 Subject: [PATCH] --- yaml --- r: 72578 b: refs/heads/master c: d718d2b17822bb92708204cb1a9175e512520261 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/misc/cytherm.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bdc1131ca58c..b19f4e986f27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54d2bc068fd21bcb096660938bce7c7265613a24 +refs/heads/master: d718d2b17822bb92708204cb1a9175e512520261 diff --git a/trunk/drivers/usb/misc/cytherm.c b/trunk/drivers/usb/misc/cytherm.c index 2677fea147d9..1cd9e7eba93b 100644 --- a/trunk/drivers/usb/misc/cytherm.c +++ b/trunk/drivers/usb/misc/cytherm.c @@ -399,7 +399,6 @@ static void cytherm_disconnect(struct usb_interface *interface) struct usb_cytherm *dev; dev = usb_get_intfdata (interface); - usb_set_intfdata (interface, NULL); device_remove_file(&interface->dev, &dev_attr_brightness); device_remove_file(&interface->dev, &dev_attr_temp); @@ -407,6 +406,9 @@ static void cytherm_disconnect(struct usb_interface *interface) device_remove_file(&interface->dev, &dev_attr_port0); device_remove_file(&interface->dev, &dev_attr_port1); + /* first remove the files, then NULL the pointer */ + usb_set_intfdata (interface, NULL); + usb_put_dev(dev->udev); kfree(dev);