* [PATCH] mmc: Return proper error code for ushc_probe()
@ 2010-11-04 5:59 Axel Lin
2010-11-04 10:04 ` David Vrabel
0 siblings, 1 reply; 3+ messages in thread
From: Axel Lin @ 2010-11-04 5:59 UTC (permalink / raw)
To: linux-kernel; +Cc: David Vrabel, Chris Ball, linux-mmc
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/mmc/host/ushc.c | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/drivers/mmc/host/ushc.c b/drivers/mmc/host/ushc.c
index b4ead4a..f8f65df 100644
--- a/drivers/mmc/host/ushc.c
+++ b/drivers/mmc/host/ushc.c
@@ -425,7 +425,7 @@ static int ushc_probe(struct usb_interface *intf, const struct usb_device_id *id
struct usb_device *usb_dev = interface_to_usbdev(intf);
struct mmc_host *mmc;
struct ushc_data *ushc;
- int ret = -ENOMEM;
+ int ret;
mmc = mmc_alloc_host(sizeof(struct ushc_data), &intf->dev);
if (mmc == NULL)
@@ -462,11 +462,15 @@ static int ushc_probe(struct usb_interface *intf, const struct usb_device_id *id
mmc->max_blk_count = 511;
ushc->int_urb = usb_alloc_urb(0, GFP_KERNEL);
- if (ushc->int_urb == NULL)
+ if (ushc->int_urb == NULL) {
+ ret = -ENOMEM;
goto err;
+ }
ushc->int_data = kzalloc(sizeof(struct ushc_int_data), GFP_KERNEL);
- if (ushc->int_data == NULL)
+ if (ushc->int_data == NULL) {
+ ret = -ENOMEM;
goto err;
+ }
usb_fill_int_urb(ushc->int_urb, ushc->usb_dev,
usb_rcvintpipe(usb_dev,
intf->cur_altsetting->endpoint[0].desc.bEndpointAddress),
@@ -475,11 +479,15 @@ static int ushc_probe(struct usb_interface *intf, const struct usb_device_id *id
intf->cur_altsetting->endpoint[0].desc.bInterval);
ushc->cbw_urb = usb_alloc_urb(0, GFP_KERNEL);
- if (ushc->cbw_urb == NULL)
+ if (ushc->cbw_urb == NULL) {
+ ret = -ENOMEM;
goto err;
+ }
ushc->cbw = kzalloc(sizeof(struct ushc_cbw), GFP_KERNEL);
- if (ushc->cbw == NULL)
+ if (ushc->cbw == NULL) {
+ ret = -ENOMEM;
goto err;
+ }
ushc->cbw->signature = USHC_CBW_SIGNATURE;
usb_fill_bulk_urb(ushc->cbw_urb, ushc->usb_dev, usb_sndbulkpipe(usb_dev, 2),
@@ -487,15 +495,21 @@ static int ushc_probe(struct usb_interface *intf, const struct usb_device_id *id
cbw_callback, ushc);
ushc->data_urb = usb_alloc_urb(0, GFP_KERNEL);
- if (ushc->data_urb == NULL)
+ if (ushc->data_urb == NULL) {
+ ret = -ENOMEM;
goto err;
+ }
ushc->csw_urb = usb_alloc_urb(0, GFP_KERNEL);
- if (ushc->csw_urb == NULL)
+ if (ushc->csw_urb == NULL) {
+ ret = -ENOMEM;
goto err;
+ }
ushc->csw = kzalloc(sizeof(struct ushc_cbw), GFP_KERNEL);
- if (ushc->csw == NULL)
+ if (ushc->csw == NULL) {
+ ret = -ENOMEM;
goto err;
+ }
usb_fill_bulk_urb(ushc->csw_urb, ushc->usb_dev, usb_rcvbulkpipe(usb_dev, 6),
ushc->csw, sizeof(struct ushc_csw),
csw_callback, ushc);
--
1.7.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mmc: Return proper error code for ushc_probe()
2010-11-04 5:59 [PATCH] mmc: Return proper error code for ushc_probe() Axel Lin
@ 2010-11-04 10:04 ` David Vrabel
2010-11-07 21:40 ` Chris Ball
0 siblings, 1 reply; 3+ messages in thread
From: David Vrabel @ 2010-11-04 10:04 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Chris Ball, linux-mmc
On 04/11/2010 05:59, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Thanks.
Acked-by: David Vrabel <david.vrabel@csr.com>
Chris, queue this one up for 2.6.37 please.
David
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mmc: Return proper error code for ushc_probe()
2010-11-04 10:04 ` David Vrabel
@ 2010-11-07 21:40 ` Chris Ball
0 siblings, 0 replies; 3+ messages in thread
From: Chris Ball @ 2010-11-07 21:40 UTC (permalink / raw)
To: David Vrabel; +Cc: Axel Lin, linux-kernel, linux-mmc
Hi,
On Thu, Nov 04, 2010 at 10:04:25AM +0000, David Vrabel wrote:
> Thanks.
>
> Acked-by: David Vrabel <david.vrabel@csr.com>
>
> Chris, queue this one up for 2.6.37 please.
Pushed and queued for 2.6.37, thanks.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-11-07 21:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-04 5:59 [PATCH] mmc: Return proper error code for ushc_probe() Axel Lin
2010-11-04 10:04 ` David Vrabel
2010-11-07 21:40 ` Chris Ball
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).