Changeset 3cc55b47 in mainline

Timestamp:

2013-08-01T15:11:20Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fdec59b

Parents:

ec6766a

Message:

usbmast: Set bulk pipes before probing the device

Fixes usbmast segfault

File:

• uspace/drv/bus/usb/usbmast/main.c (modified) (3 diffs)

uspace/drv/bus/usb/usbmast/main.c

@@ -52 +52 @@
 #define NAME "usbmast"
 
-#define GET_BULK_IN(dev) ((dev)->pipes[BULK_IN_EP].pipe)
-#define GET_BULK_OUT(dev) ((dev)->pipes[BULK_OUT_EP].pipe)
-
 static const usb_endpoint_description_t bulk_in_ep = {
         .transfer_type = USB_TRANSFER_BULK,
@@ -184 +181 @@
         }
 
+        mdev->bulk_in_pipe = &epm_in->pipe;
+        mdev->bulk_out_pipe = &epm_out->pipe;
         for (i = 0; i < mdev->lun_count; i++) {
                 rc = usbmast_fun_create(mdev, i);
@@ -189 +188 @@
                         goto error;
         }
-        mdev->bulk_in_pipe = &epm_in->pipe;
-        mdev->bulk_out_pipe = &epm_out->pipe;
 
         return EOK;