diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
| commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
| tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /Documentation/DocBook/writing_usb_driver.tmpl | |
| parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
| parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
Diffstat (limited to 'Documentation/DocBook/writing_usb_driver.tmpl')
| -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> |