Changeset 925a21e in mainline for uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c (modified) (1 diff)

uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c

@@ -80 +80 @@
                 if (!usb_kbd_is_initialized(kbd)) {
                         if (usb_kbd_is_ready_to_destroy(kbd)) {
-                                usb_kbd_free(&kbd);
-                                assert(kbd == NULL);
+                                usb_kbd_destroy(kbd);
                         }
                         return;