---

yaml --- r: 249737 b: refs/heads/master c: d48e5cf h: refs/heads/master i: 249735: 5b8e657 v: v3
git-mirror · May 18, 2011 · 34bba89 · 34bba89
1 parent 6af16a7
commit 34bba89
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3aa4fc587df15a7a55bd6e3f3fbdcca30c7acc58
+refs/heads/master: d48e5cffb312b08d74c880411b3fb4d5d5ad93f6
diff --git a/trunk/drivers/staging/keucr/transport.c b/trunk/drivers/staging/keucr/transport.c
@@ -629,8 +629,12 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us)
 
 	/*  R/W data */
 	if (transfer_length) {
-		unsigned int pipe = srb->sc_data_direction ==
-		DMA_FROM_DEVICE ? us->recv_bulk_pipe : us->send_bulk_pipe;
+		unsigned int pipe;
+		if (srb->sc_data_direction == DMA_FROM_DEVICE)
+			pipe = us->recv_bulk_pipe;
+		else
+			pipe = us->send_bulk_pipe;
+
 		result = usb_stor_bulk_srb(us, pipe, srb);
 		/* pr_info("Bulk data transfer result 0x%x\n", result); */
 		if (result == USB_STOR_XFER_ERROR)