ia64/xen-unstable

changeset 4054:fc3672e12015

bitkeeper revision 1.1236.12.27 (422f58a6FHMzvukIjBli5nkkUJAzRQ)

Merge bk://xen.bkbits.net/xeno-unstable.bk
into maw48.kings.cam.ac.uk:/scratch/xen/xeno-unstable.bk
author mark@maw48.kings.cam.ac.uk
date Wed Mar 09 20:12:22 2005 +0000 (2005-03-09)
parents a38777f9f099 4eb6fb3315e8
children f4ef980acf07
files linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c	Wed Mar 09 18:31:33 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c	Wed Mar 09 20:12:22 2005 +0000
     1.3 @@ -725,7 +725,7 @@ static void dispatch_usb_io(usbif_priv_t
     1.4      purb->dev = port->dev;
     1.5      purb->context = pending_req;
     1.6      purb->transfer_buffer =
     1.7 -        (void *)MMAP_VADDR(pending_idx, 0) + (buffer_mach & ~PAGE_MASK);
     1.8 +        (void *)(MMAP_VADDR(pending_idx, 0) + offset_in_page(buffer_mach));
     1.9      if(buffer_mach == 0)
    1.10        purb->transfer_buffer = NULL;
    1.11      purb->complete = __end_usb_io_op;
     2.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c	Wed Mar 09 18:31:33 2005 +0000
     2.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c	Wed Mar 09 20:12:22 2005 +0000
     2.3 @@ -331,6 +331,9 @@ static int xhci_port_reset(usbif_vdev_t 
     2.4                  xhci_drain_ring();
     2.5          }
     2.6  
     2.7 +	xhci->rh.ports[port].pe = 1;
     2.8 +	xhci->rh.ports[port].pe_chg = 1;
     2.9 +
    2.10          return xhci->awaiting_reset;
    2.11  }
    2.12