Commit bb754dbc authored by Pavel Rojtberg's avatar Pavel Rojtberg Committed by Greg Kroah-Hartman

Input: xpad - simplify error condition in init_output

[ Upstream commit a8c34e27 ]

Replace first goto with simple returns as we really are just returning
one error code.
Signed-off-by: default avatarPavel Rojtberg <>
Signed-off-by: default avatarDmitry Torokhov <>
Signed-off-by: default avatarSasha Levin <>
parent fbc530b7
......@@ -851,17 +851,15 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
xpad->odata = usb_alloc_coherent(xpad->udev, XPAD_PKT_LEN,
GFP_KERNEL, &xpad->odata_dma);
if (!xpad->odata) {
error = -ENOMEM;
goto fail1;
if (!xpad->odata)
return -ENOMEM;
xpad->irq_out = usb_alloc_urb(0, GFP_KERNEL);
if (!xpad->irq_out) {
error = -ENOMEM;
goto fail2;
goto err_free_coherent;
/* Xbox One controller has in/out endpoints swapped. */
......@@ -877,8 +875,9 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
return 0;
fail2: usb_free_coherent(xpad->udev, XPAD_PKT_LEN, xpad->odata, xpad->odata_dma);
fail1: return error;
usb_free_coherent(xpad->udev, XPAD_PKT_LEN, xpad->odata, xpad->odata_dma);
return error;
static void xpad_stop_output(struct usb_xpad *xpad)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment