X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fblock%2Fub.c;h=746a118a9b52ba1792b28861605902534290d1d4;hb=9a9136e270af14da506f66bcafcc506b86a86498;hp=2098eff91e14721641f81c47b3c510481fbb6bcc;hpb=ea14fad0d416354a4e9bb1a04f32acba706f9548;p=powerpc.git

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 2098eff91e..746a118a9b 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -2132,10 +2132,13 @@ static int ub_get_pipes(struct ub_dev *sc, struct usb_device *dev,
 		if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
 				== USB_ENDPOINT_XFER_BULK) {
 			/* BULK in or out? */
-			if (ep->bEndpointAddress & USB_DIR_IN)
-				ep_in = ep;
-			else
-				ep_out = ep;
+			if (ep->bEndpointAddress & USB_DIR_IN) {
+				if (ep_in == NULL)
+					ep_in = ep;
+			} else {
+				if (ep_out == NULL)
+					ep_out = ep;
+			}
 		}
 	}