| usb_generic.c (220304) | usb_generic.c (222786) |
|---|---|
| 1/* $FreeBSD: head/sys/dev/usb/usb_generic.c 220304 2011-04-03 20:22:49Z hselasky $ */ | 1/* $FreeBSD: head/sys/dev/usb/usb_generic.c 222786 2011-06-06 21:45:09Z hselasky $ */ |
| 2/*- 3 * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright 9 * notice, this list of conditions and the following disclaimer. --- 951 unchanged lines hidden (view full) --- 961 return (EINVAL); 962 } 963 /* make sure all FIFO's are gone */ 964 /* else there can be a deadlock */ 965 if (ugen_fs_uninit(f)) { 966 /* ignore any errors */ 967 DPRINTFN(6, "no FIFOs\n"); 968 } | 2/*- 3 * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright 9 * notice, this list of conditions and the following disclaimer. --- 951 unchanged lines hidden (view full) --- 961 return (EINVAL); 962 } 963 /* make sure all FIFO's are gone */ 964 /* else there can be a deadlock */ 965 if (ugen_fs_uninit(f)) { 966 /* ignore any errors */ 967 DPRINTFN(6, "no FIFOs\n"); 968 } |
| 969 if (udev->re_enumerate_wait == 0) { 970 udev->re_enumerate_wait = 1; 971 usb_needs_explore(udev->bus, 0); 972 } | 969 /* start re-enumeration of device */ 970 usbd_start_re_enumerate(udev); |
| 973 return (0); 974} 975 976int 977ugen_fs_uninit(struct usb_fifo *f) 978{ 979 if (f->fs_xfer == NULL) { 980 return (EINVAL); --- 1288 unchanged lines hidden --- | 971 return (0); 972} 973 974int 975ugen_fs_uninit(struct usb_fifo *f) 976{ 977 if (f->fs_xfer == NULL) { 978 return (EINVAL); --- 1288 unchanged lines hidden --- |