PERFORCE change 145838 for review

Hans Petter Selasky hselasky at FreeBSD.org
Thu Jul 24 19:39:38 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=145838

Change 145838 by hselasky at hselasky_laptop001 on 2008/07/24 19:39:21

	
	Bugfixes.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#15 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#7 (text+ko) ====

@@ -2737,7 +2737,7 @@
 	    (EHCI_VIRTUAL_FRAMELIST_COUNT - 1);
 
 	if ((xfer->pipe->is_synced == 0) ||
-	    (buf_offset < xfer->nframes)) {
+	    (buf_offset < ((xfer->nframes + 7) / 8))) {
 		/*
 		 * If there is data underflow or the pipe queue is empty we
 		 * schedule the transfer a few frames ahead of the current

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#3 (text+ko) ====

@@ -87,7 +87,7 @@
 		return (1);
 	}
 	if (usb2_proc_setup(&(ctd->usb2_proc), priv_mtx, USB_PRI_MED)) {
-		free(M_USBDEV, ctd->p_msgs);
+		free(ctd->p_msgs, M_USBDEV);
 		ctd->p_msgs = NULL;
 		return (1);
 	}

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#15 (text+ko) ====

@@ -948,7 +948,7 @@
 	}
 done:
 	if (data) {
-		free(M_USBDEV, data);
+		free(data, M_USBDEV);
 	}
 	return (error);
 }


More information about the p4-projects mailing list