thunderbolt: Make tb_tunnel_alloc_usb3() error paths consistent with the rest

Make the tb_tunnel_alloc_usb3() error codepaths consistent with the
DisplayPort and PCIe counterparts.

No functional changes.

Signed-off-by: Alan Borzeszkowski <alan.borzeszkowski@linux.intel.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/thunderbolt/tunnel.c b/drivers/thunderbolt/tunnel.c
index 8229a6fbda5ab42859b50ba0d1c7cf5bc2e46c21..072f7e80263e0f09dcb4e7fe4a7a9feb2ec81fc7 100644 (file)
--- a/drivers/thunderbolt/tunnel.c
+++ b/drivers/thunderbolt/tunnel.c
@@ -2224,19 +2224,15 @@ struct tb_tunnel *tb_tunnel_alloc_usb3(struct tb *tb, struct tb_port *up,
 
        path = tb_path_alloc(tb, down, TB_USB3_HOPID, up, TB_USB3_HOPID, 0,
                             "USB3 Down");
-       if (!path) {
-               tb_tunnel_put(tunnel);
-               return NULL;
-       }
+       if (!path)
+               goto err_free;
        tb_usb3_init_path(path);
        tunnel->paths[TB_USB3_PATH_DOWN] = path;
 
        path = tb_path_alloc(tb, up, TB_USB3_HOPID, down, TB_USB3_HOPID, 0,
                             "USB3 Up");
-       if (!path) {
-               tb_tunnel_put(tunnel);
-               return NULL;
-       }
+       if (!path)
+               goto err_free;
        tb_usb3_init_path(path);
        tunnel->paths[TB_USB3_PATH_UP] = path;
 
@@ -2253,6 +2249,10 @@ struct tb_tunnel *tb_tunnel_alloc_usb3(struct tb *tb, struct tb_port *up,
        }
 
        return tunnel;
+
+err_free:
+       tb_tunnel_put(tunnel);
+       return NULL;
 }
 
 /**