diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 19:41:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 19:41:58 -0500 |
commit | 9641219825a54249d77d7aa1afa7d874a05c7f90 (patch) | |
tree | 94dae67a8804a070e2597b931d1e3335f08389fc /Documentation | |
parent | 72a73a69f6a79266b8b4b18f796907b73a5c01e3 (diff) | |
parent | 94fcda1f8ab5e0cacc381c5ca1cc9aa6ad523576 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (103 commits)
usbcore: remove unused argument in autosuspend
USB: keep count of unsuspended children
USB hub: simplify remote-wakeup handling
USB: struct usb_device: change flag to bitflag
OHCI: make autostop conditional on CONFIG_PM
USB: Add autosuspend support to the hub driver
EHCI: Fix root-hub and port suspend/resume problems
USB: create a new thread for every USB device found during the probe sequence
USB: add driver for the USB debug devices
USB: added dynamic major number for USB endpoints
USB: pegasus error path not resetting task's state
USB: endianness fix for asix.c
USB: build the appledisplay driver
USB serial: replace kmalloc+memset with kzalloc
USB: hid-core: canonical defines for Apple USB device IDs
USB: idmouse cleanup
USB: make drivers/usb/core/driver.c:usb_device_match() static
USB: lh7a40x_udc remove double declaration
USB: pxa2xx_udc recognizes ixp425 rev b0 chip
usbtouchscreen: add support for DMC TSC-10/25 devices
...
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/DocBook/writing_usb_driver.tmpl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/DocBook/writing_usb_driver.tmpl b/Documentation/DocBook/writing_usb_driver.tmpl index 07cd34c1940b..d4188d4ff535 100644 --- a/Documentation/DocBook/writing_usb_driver.tmpl +++ b/Documentation/DocBook/writing_usb_driver.tmpl | |||
@@ -345,8 +345,7 @@ static inline void skel_delete (struct usb_skel *dev) | |||
345 | usb_buffer_free (dev->udev, dev->bulk_out_size, | 345 | usb_buffer_free (dev->udev, dev->bulk_out_size, |
346 | dev->bulk_out_buffer, | 346 | dev->bulk_out_buffer, |
347 | dev->write_urb->transfer_dma); | 347 | dev->write_urb->transfer_dma); |
348 | if (dev->write_urb != NULL) | 348 | usb_free_urb (dev->write_urb); |
349 | usb_free_urb (dev->write_urb); | ||
350 | kfree (dev); | 349 | kfree (dev); |
351 | } | 350 | } |
352 | </programlisting> | 351 | </programlisting> |