From: Marc Kleine-Budde <mkl@pengutronix.de>
To: davem@davemloft.net
Cc: Netdev@vger.kernel.org, kernel@pengutronix.de,
mkl@blackshift.org, linux-can@vger.kernel.org,
Sebastian Haas <dev@sebastianhaas.info>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 4/9] can: ems_usb: Improved memory handling on ems_usb_start
Date: Fri, 3 Feb 2012 01:51:53 +0100 [thread overview]
Message-ID: <1328230318-8962-5-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1328230318-8962-1-git-send-email-mkl@pengutronix.de>
From: Sebastian Haas <dev@sebastianhaas.info>
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>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
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 7dae64d..9783e02 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.4.1
next prev parent reply other threads:[~2012-02-03 0:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-03 0:51 [PATCH 0/9] can: driver updates Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 1/9] can: ems_usb: Removed double netif_device_detach Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 2/9] can: dev: let can_get_echo_skb() return dlc of CAN frame Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 3/9] can: flexcan: Fix CAN_RAW_RECV_OWN_MSGS and CAN_RAW_LOOPBACK Marc Kleine-Budde
2012-02-03 0:51 ` Marc Kleine-Budde [this message]
2012-02-03 0:51 ` [PATCH 5/9] can: plx_pci: add support for IXXAT PCI cards Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 6/9] can: pch_can: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 7/9] can: Kconfig: add more information about Intel EG20T PCH CAN controller Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 8/9] can: bfin_can/ti_hecc/mscan: add missing do_get_berr_counter callback Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 9/9] can: replace the dev_dbg/info/err/... with the new netdev_xxx macros Marc Kleine-Budde
2012-02-04 21:44 ` [PATCH 0/9] can: driver updates David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328230318-8962-5-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=Netdev@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=dev@sebastianhaas.info \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=mkl@blackshift.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).