| usb_transfer.c (302408) | usb_transfer.c (305733) |
|---|---|
| 1/* $FreeBSD: stable/11/sys/dev/usb/usb_transfer.c 298932 2016-05-02 17:44:03Z pfg $ */ | 1/* $FreeBSD: stable/11/sys/dev/usb/usb_transfer.c 305733 2016-09-12 10:14:30Z 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. --- 938 unchanged lines hidden (view full) --- 948 } 949 ppxfer[n] = NULL; 950 } 951 952 if (error) 953 return (error); 954 955 /* Protect scratch area */ | 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. --- 938 unchanged lines hidden (view full) --- 948 } 949 ppxfer[n] = NULL; 950 } 951 952 if (error) 953 return (error); 954 955 /* Protect scratch area */ |
| 956 do_unlock = usbd_enum_lock(udev); | 956 do_unlock = usbd_ctrl_lock(udev); |
| 957 958 refcount = 0; 959 info = NULL; 960 961 parm = &udev->scratch.xfer_setup[0].parm; 962 memset(parm, 0, sizeof(*parm)); 963 964 parm->udev = udev; --- 304 unchanged lines hidden (view full) --- 1269 1270 /* check if any errors happened */ 1271 if (parm->err) 1272 usbd_transfer_unsetup(ppxfer, n_setup); 1273 1274 error = parm->err; 1275 1276 if (do_unlock) | 957 958 refcount = 0; 959 info = NULL; 960 961 parm = &udev->scratch.xfer_setup[0].parm; 962 memset(parm, 0, sizeof(*parm)); 963 964 parm->udev = udev; --- 304 unchanged lines hidden (view full) --- 1269 1270 /* check if any errors happened */ 1271 if (parm->err) 1272 usbd_transfer_unsetup(ppxfer, n_setup); 1273 1274 error = parm->err; 1275 1276 if (do_unlock) |
| 1277 usbd_enum_unlock(udev); | 1277 usbd_ctrl_unlock(udev); |
| 1278 1279 return (error); 1280} 1281 1282/*------------------------------------------------------------------------* 1283 * usbd_transfer_unsetup_sub - factored out code 1284 *------------------------------------------------------------------------*/ 1285static void --- 2253 unchanged lines hidden --- | 1278 1279 return (error); 1280} 1281 1282/*------------------------------------------------------------------------* 1283 * usbd_transfer_unsetup_sub - factored out code 1284 *------------------------------------------------------------------------*/ 1285static void --- 2253 unchanged lines hidden --- |