aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuncan Sands <baldrick@free.fr>2006-01-13 04:07:08 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-31 20:23:39 -0500
commit72ef8ab43f5a82e9e2dea247702bf433d6509f87 (patch)
tree3bd0837a41fa63747fcda1d7f678abe47398f937
parent0e42a627ec3d8defa0c43cff94b8f2080a070716 (diff)
[PATCH] USBATM: return correct error code when out of memory
We weren't always returning -ENOMEM. Signed-off-by: Duncan Sands <baldrick@free.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/atm/usbatm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index e660a1ebf12b..103764df47ea 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -1081,6 +1081,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
1081 urb = usb_alloc_urb(iso_packets, GFP_KERNEL); 1081 urb = usb_alloc_urb(iso_packets, GFP_KERNEL);
1082 if (!urb) { 1082 if (!urb) {
1083 dev_err(dev, "%s: no memory for urb %d!\n", __func__, i); 1083 dev_err(dev, "%s: no memory for urb %d!\n", __func__, i);
1084 error = -ENOMEM;
1084 goto fail_unbind; 1085 goto fail_unbind;
1085 } 1086 }
1086 1087
@@ -1090,6 +1091,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
1090 buffer = kzalloc(channel->buf_size, GFP_KERNEL); 1091 buffer = kzalloc(channel->buf_size, GFP_KERNEL);
1091 if (!buffer) { 1092 if (!buffer) {
1092 dev_err(dev, "%s: no memory for buffer %d!\n", __func__, i); 1093 dev_err(dev, "%s: no memory for buffer %d!\n", __func__, i);
1094 error = -ENOMEM;
1093 goto fail_unbind; 1095 goto fail_unbind;
1094 } 1096 }
1095 1097