From 8a77a681a94fd16cfeedb17ba803fb7bd556c28f Mon Sep 17 00:00:00 2001 From: Sebastian Haas Date: Thu, 22 Dec 2011 23:58:34 +0100 Subject: [PATCH] --- yaml --- r: 289889 b: refs/heads/master c: 2ee6850ca0cac95101d2a36c8b186b40d4fc7311 h: refs/heads/master i: 289887: d9f4608e74457115b5277f88c30254ed9e136f96 v: v3 --- [refs] | 2 +- trunk/drivers/net/can/usb/ems_usb.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 785a798e22fd..f18542f26e8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a12349663061d25b49e6542d005fa7193a2cb44 +refs/heads/master: 2ee6850ca0cac95101d2a36c8b186b40d4fc7311 diff --git a/trunk/drivers/net/can/usb/ems_usb.c b/trunk/drivers/net/can/usb/ems_usb.c index 7dae64d44e83..9783e02fbc26 100644 --- a/trunk/drivers/net/can/usb/ems_usb.c +++ b/trunk/drivers/net/can/usb/ems_usb.c @@ -607,7 +607,8 @@ static int ems_usb_start(struct ems_usb *dev) if (!urb) { dev_err(netdev->dev.parent, "No memory left for URBs\n"); - return -ENOMEM; + err = -ENOMEM; + break; } buf = usb_alloc_coherent(dev->udev, RX_BUFFER_SIZE, GFP_KERNEL, @@ -616,7 +617,8 @@ static int ems_usb_start(struct ems_usb *dev) dev_err(netdev->dev.parent, "No memory left for USB buffer\n"); usb_free_urb(urb); - return -ENOMEM; + err = -ENOMEM; + break; } usb_fill_bulk_urb(urb, dev->udev, usb_rcvbulkpipe(dev->udev, 2),