diff --git a/src/add-ons/kernel/drivers/ports/usb_serial/Option.cpp b/src/add-ons/kernel/drivers/ports/usb_serial/Option.cpp
index 8c0de2a0f7..d82812d6dd 100644
--- a/src/add-ons/kernel/drivers/ports/usb_serial/Option.cpp
+++ b/src/add-ons/kernel/drivers/ports/usb_serial/Option.cpp
@@ -64,8 +64,8 @@ OptionDevice::AddDevice(const usb_configuration_info *config)
 			TRACE("> OptionDevice::%s: found at interface %d\n", __func__,
 				index);
 			usb_endpoint_info *irEndpoint = &interface->endpoint[irEndpointID];
-			usb_endpoint_info *txEndpoint = &interface->endpoint[irEndpointID];
-			usb_endpoint_info *rxEndpoint = &interface->endpoint[irEndpointID];
+			usb_endpoint_info *txEndpoint = &interface->endpoint[txEndpointID];
+			usb_endpoint_info *rxEndpoint = &interface->endpoint[rxEndpointID];
 			SetControlPipe(irEndpoint->handle);
 			SetReadPipe(rxEndpoint->handle);
 			SetWritePipe(txEndpoint->handle);