From 34bba8972acd9e718fbc50f7f6d41631e8f0967f Mon Sep 17 00:00:00 2001 From: "Cho, Yu-Chen" Date: Wed, 18 May 2011 18:40:15 +0800 Subject: [PATCH] --- yaml --- r: 249737 b: refs/heads/master c: d48e5cffb312b08d74c880411b3fb4d5d5ad93f6 h: refs/heads/master i: 249735: 5b8e6570ce9e7df939168362f5cad2fbfeee380d v: v3 --- [refs] | 2 +- trunk/drivers/staging/keucr/transport.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index abbea7f85545..a2e20f187d2f 100644 --- 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 index d48f592fe2aa..0274cb0edd01 100644 --- 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)