This patch puts the call to usb_alloc_urb() before the critical
section starts that is protected with the io_mutex lock. This is
to make the section as short as possible and to use the regular
GFP_KERNEL flag.

Signed-off-by: Christian Gromm <christian.gr...@microchip.com>
Reported-by: Dan Carpenter <dan.carpen...@oracle.com>
---
 drivers/staging/most/usb/usb.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/most/usb/usb.c b/drivers/staging/most/usb/usb.c
index a605e0f..534825f 100644
--- a/drivers/staging/most/usb/usb.c
+++ b/drivers/staging/most/usb/usb.c
@@ -467,18 +467,16 @@ static int hdm_enqueue(struct most_interface *iface, int 
channel,
        if (iface->num_channels <= channel || channel < 0)
                return -ECHRNG;
 
+       urb = usb_alloc_urb(NO_ISOCHRONOUS_URB, GFP_KERNEL);
+       if (!urb)
+               return -ENOMEM;
+
        conf = &mdev->conf[channel];
 
        mutex_lock(&mdev->io_mutex);
        if (!mdev->usb_device) {
                retval = -ENODEV;
-               goto unlock_io_mutex;
-       }
-
-       urb = usb_alloc_urb(NO_ISOCHRONOUS_URB, GFP_ATOMIC);
-       if (!urb) {
-               retval = -ENOMEM;
-               goto unlock_io_mutex;
+               goto err_free_urb;
        }
 
        if ((conf->direction & MOST_CH_TX) && mdev->padding_active[channel] &&
-- 
2.7.4

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to