| Message ID | 1470926334-24532-1-git-send-email-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 410280bac6224e066f4cf0b87db08f0418a135b6 |
| Delegated to: | Kalle Valo |
| Headers | show |
On Thu, Aug 11, 2016 at 04:38:54PM +0200, Christophe JAILLET wrote: > We know that 'retval = 0' because it has been tested a few lines above. > So, if 'devm_kmalloc' fails, 0 will be returned instead of an error code. > Return -ENOMEM instead. > > Fixes: 8b4c0009313f ("rt2x00usb: Use usb anchor to manage URB") > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Christophe Jaillet <christophe.jaillet@wanadoo.fr> wrote: > We know that 'retval = 0' because it has been tested a few lines above. > So, if 'devm_kmalloc' fails, 0 will be returned instead of an error code. > Return -ENOMEM instead. > > Fixes: 8b4c0009313f ("rt2x00usb: Use usb anchor to manage URB") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> Thanks, 1 patch applied to wireless-drivers-next.git: 410280bac622 rt2x00usb: Fix error return code
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c index 7cf26c6124d1..6005e14213ca 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c @@ -831,8 +831,10 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, rt2x00dev->anchor = devm_kmalloc(&usb_dev->dev, sizeof(struct usb_anchor), GFP_KERNEL); - if (!rt2x00dev->anchor) + if (!rt2x00dev->anchor) { + retval = -ENOMEM; goto exit_free_reg; + } init_usb_anchor(rt2x00dev->anchor); return 0;
We know that 'retval = 0' because it has been tested a few lines above. So, if 'devm_kmalloc' fails, 0 will be returned instead of an error code. Return -ENOMEM instead. Fixes: 8b4c0009313f ("rt2x00usb: Use usb anchor to manage URB") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)