[PATCH 3.18 55/83] Input: xpad - simplify error condition in init_output

[Greg Kroah-Hartman]

3.18-stable review patch.  If anyone has any objections, please let me know.

------------------

[ Upstream commit a8c34e27fb1ece928ec728bfe596aa6ca0b1928a ]

Replace first goto with simple returns as we really are just returning
one error code.

Signed-off-by: Pavel Rojtberg <rojtb...@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torok...@gmail.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/input/joystick/xpad.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index b06f4b0785f7..d837900d609e 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -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;
 
        spin_lock_init(&xpad->odata_lock);
 
        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;
+err_free_coherent:
+       usb_free_coherent(xpad->udev, XPAD_PKT_LEN, xpad->odata, 
xpad->odata_dma);
+       return error;
 }
 
 static void xpad_stop_output(struct usb_xpad *xpad)
-- 
2.17.1