[PATCH 2/2] ems_usb: Improved memory handling on ems_usb_start

[PATCH 2/2] ems_usb: Improved memory handling on ems_usb_start

[Sebastian Haas]

 From 9d0d92d279255eed7f14b9fd70d1f0d181d4b301 Mon Sep 17 00:00:00 2001
From: Sebastian Haas <dev@sebastianhaas.info>
Date: Thu, 22 Dec 2011 23:27:47 +0100
Subject: [PATCH 2/2] ems_usb: Improved memory handling on ems_usb_start

Do not return from ems_usb_start if allocation fails. If not all URBs
could be allocated use the one already submitted.

Signed-off-by: Sebastian Haas <dev@sebastianhaas.info>
---
  drivers/net/can/usb/ems_usb.c |    6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 55ab0c4..c91c9b6 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/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),
-- 
1.7.5.4

Re: [PATCH 2/2] ems_usb: Improved memory handling on ems_usb_start

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 917 bytes --]

On 12/22/2011 11:58 PM, Sebastian Haas wrote:
> From 9d0d92d279255eed7f14b9fd70d1f0d181d4b301 Mon Sep 17 00:00:00 2001
> From: Sebastian Haas <dev@sebastianhaas.info>
> Date: Thu, 22 Dec 2011 23:27:47 +0100
> Subject: [PATCH 2/2] ems_usb: Improved memory handling on ems_usb_start
> 
> Do not return from ems_usb_start if allocation fails. If not all URBs
> could be allocated use the one already submitted.
> 
> Signed-off-by: Sebastian Haas <dev@sebastianhaas.info>

Can you please send with "git send-email" the next time. Your mailer
converts tabs to spaces. I applied your patch by hand.

Applied to can-next.
tnx Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]