Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[~andy/linux] / drivers / staging / keucr / init.c

diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c
index e6c56deec94cd9da0066227de1bbac0c36dbdab3..515e448852a0a32c5b1a0482f2190a5a4b918fbf 100644 (file)
--- a/drivers/staging/keucr/init.c
+++ b/drivers/staging/keucr/init.c
@@ -364,8 +364,13 @@ int ENE_SendScsiCmd(struct us_data *us, BYTE fDir, void *buf, int use_sg)
        }
 
        if (buf) {
-               unsigned int pipe = fDir ==
-                       FDIR_READ ? us->recv_bulk_pipe : us->send_bulk_pipe;
+               unsigned int pipe = fDir;
+
+               if (fDir == FDIR_READ)
+                       pipe = us->recv_bulk_pipe;
+               else
+                       pipe = us->send_bulk_pipe;
+
                /* Bulk */
                if (use_sg)
                        result = usb_stor_bulk_srb(us, pipe, us->srb);