Another UHCI merge error in 2.3.17

Thomas Sailer (sailer@ife.ee.ethz.ch)
Wed, 08 Sep 1999 13:41:53 +0200

This is a multi-part message in MIME format.
--------------6B5666962D4A1CBD82B57A7F
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

And the fix:
--------------6B5666962D4A1CBD82B57A7F
Content-Type: text/plain; charset=us-ascii;
name="uhci-2.3.17.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="uhci-2.3.17.diff"

--- drivers/usb/uhci.c.orig Wed Sep 8 13:29:41 1999
+++ drivers/usb/uhci.c Wed Sep 8 13:33:30 1999
@@ -860,21 +860,10 @@
if (ix < START_FRAME_FUDGE || /* too small */
ix > CAN_SCHEDULE_FRAMES) { /* too large */
#ifdef CONFIG_USB_DEBUG_ISOC
- printk (KERN_DEBUG "uhci_init_isoc: bad start_frame value (%d)\n",
- isocdesc->start_frame);
+ printk (KERN_DEBUG "uhci_init_isoc: bad start_frame value (%d,%d)\n",
+ isocdesc->start_frame, cur_frame);
#endif
return -EINVAL;
- }
- }
- else /* start_frame <= cur_frame */ {
- if ((isocdesc->start_frame + UHCI_MAX_SOF_NUMBER + 1
- - cur_frame) > CAN_SCHEDULE_FRAMES) {
-#ifdef CONFIG_USB_DEBUG_ISOC
- printk (KERN_DEBUG "uhci_init_isoc: bad start_frame value (%d)\n",
- isocdesc->start_frame);
-#endif
- return -EINVAL;
- }
}
} /* end START_ABSOLUTE */
}

--------------6B5666962D4A1CBD82B57A7F--

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/