summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Falzoi <fabio.falzoi84@gmail.com>2014-04-22 21:23:03 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-15 22:20:51 (GMT)
commitc606525d76d16702de1b40fcf017e63f31c270c1 (patch)
treedb8124c6f401dd32ce1543e52410e3550cc2b18c
parent4b3ef391c320b112d140f991dbde5da9c651a690 (diff)
downloadlinux-c606525d76d16702de1b40fcf017e63f31c270c1.tar.xz
Staging: rts5139: Removed OOM messages
All allocation Out Of Memory messages removed. We rely on the generic OOM message in dump_stack(). Signed-off-by: Fabio Falzoi <fabio.falzoi84@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rts5139/rts51x.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/staging/rts5139/rts51x.c b/drivers/staging/rts5139/rts51x.c
index 8a0f9ae..6120410 100644
--- a/drivers/staging/rts5139/rts51x.c
+++ b/drivers/staging/rts5139/rts51x.c
@@ -460,7 +460,6 @@ static int associate_dev(struct rts51x_chip *chip, struct usb_interface *intf)
rts51x->cr = usb_buffer_alloc(rts51x->pusb_dev, sizeof(*rts51x->cr),
GFP_KERNEL, &rts51x->cr_dma);
if (!rts51x->cr) {
- pr_debug("usb_ctrlrequest allocation failed\n");
usb_set_intfdata(intf, NULL);
return -ENOMEM;
}
@@ -468,7 +467,6 @@ static int associate_dev(struct rts51x_chip *chip, struct usb_interface *intf)
rts51x->iobuf = usb_buffer_alloc(rts51x->pusb_dev, RTS51X_IOBUF_SIZE,
GFP_KERNEL, &rts51x->iobuf_dma);
if (!rts51x->iobuf) {
- pr_debug("I/O buffer allocation failed\n");
usb_set_intfdata(intf, NULL);
return -ENOMEM;
}
@@ -598,16 +596,12 @@ static int rts51x_acquire_resources(struct rts51x_chip *chip)
int retval;
rts51x->current_urb = usb_alloc_urb(0, GFP_KERNEL);
- if (!rts51x->current_urb) {
- pr_debug("URB allocation failed\n");
+ if (!rts51x->current_urb)
return -ENOMEM;
- }
rts51x->intr_urb = usb_alloc_urb(0, GFP_KERNEL);
- if (!rts51x->intr_urb) {
- pr_debug("URB allocation failed\n");
+ if (!rts51x->intr_urb)
return -ENOMEM;
- }
chip->cmd_buf = rts51x->iobuf;
chip->rsp_buf = rts51x->iobuf;
@@ -726,11 +720,8 @@ static int rts51x_probe(struct usb_interface *intf,
pr_debug("%s detected\n", RTS51X_NAME);
rts51x = kzalloc(sizeof(struct rts51x_usb), GFP_KERNEL);
- if (!rts51x) {
- pr_warn(RTS51X_TIP
- "Unable to allocate rts51x_usb\n");
+ if (!rts51x)
return -ENOMEM;
- }
/*
* Ask the SCSI layer to allocate a host structure, with extra
@@ -738,8 +729,6 @@ static int rts51x_probe(struct usb_interface *intf,
*/
host = scsi_host_alloc(&rts51x_host_template, sizeof(*chip));
if (!host) {
- pr_warn(RTS51X_TIP
- "Unable to allocate the scsi host\n");
kfree(rts51x);
return -ENOMEM;
}