diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-04 00:29:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-04 00:29:13 -0400 |
| commit | bf9127c36341573dc47a9c2fc003dcf13bbbf246 (patch) | |
| tree | bd225092dbdd05b8738e6ac811f4f8d06aea8b22 /drivers/usb/misc/sisusbvga/sisusb.c | |
| parent | b620754bfeb8b0e0c6622b03d5ee2f1af1d3082f (diff) | |
| parent | b89cbb81aec2015b4020221564ced1569e1a8900 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: adding comment for ipaq forcing number of ports
USB: fix Oops on loading ipaq module since 2.6.26
USB: add a pl2303 device id
USB: another option device id
USB: don't lose disconnections during suspend
USB: fix interrupt disabling for HCDs with shared interrupt handlers
USB: New device ID for ftdi_sio driver
sisusbvga: Fix oops on disconnect.
USB: mass storage: new id for US_SC_CYP_ATACB
USB: ohci - record data toggle after unlink
USB: ehci - fix timer regression
USB: fix cdc-acm resume()
OHCI: Fix problem if SM501 and another platform driver is selected
Diffstat (limited to 'drivers/usb/misc/sisusbvga/sisusb.c')
| -rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index cb7fa0eaf3ae..33182f4c2267 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c | |||
| @@ -3264,8 +3264,6 @@ static void sisusb_disconnect(struct usb_interface *intf) | |||
| 3264 | 3264 | ||
| 3265 | /* decrement our usage count */ | 3265 | /* decrement our usage count */ |
| 3266 | kref_put(&sisusb->kref, sisusb_delete); | 3266 | kref_put(&sisusb->kref, sisusb_delete); |
| 3267 | |||
| 3268 | dev_info(&sisusb->sisusb_dev->dev, "Disconnected\n"); | ||
| 3269 | } | 3267 | } |
| 3270 | 3268 | ||
| 3271 | static struct usb_device_id sisusb_table [] = { | 3269 | static struct usb_device_id sisusb_table [] = { |