diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index 4792f961a..addfb41e8 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -474,7 +474,7 @@ grub_uhci_setup_transfer (grub_usb_controller_t dev,
     {
       grub_usb_transaction_t tr = &transfer->transactions[i];
 
-      td = grub_uhci_transaction (u, transfer->endpoint, tr->pid,
+      td = grub_uhci_transaction (u, transfer->endpoint & 15, tr->pid,
 				  transfer->devaddr, tr->toggle,
 				  tr->size, tr->data);
       if (! td)
diff --git a/bus/usb/usbtrans.c b/bus/usb/usbtrans.c
index 5d6966ecc..7e6840083 100644
--- a/bus/usb/usbtrans.c
+++ b/bus/usb/usbtrans.c
@@ -246,7 +246,7 @@ grub_usb_bulk_setup_readwrite (grub_usb_device_t dev,
   datablocks = ((size + max - 1) / max);
   transfer->transcnt = datablocks;
   transfer->size = size - 1;
-  transfer->endpoint = endpoint & 15;
+  transfer->endpoint = endpoint;
   transfer->devaddr = dev->addr;
   transfer->type = GRUB_USB_TRANSACTION_TYPE_BULK;
   transfer->dir = type;