hso: fix bailout in error case of probe

commit 5fcfb6d0bfcda17f0d0656e4e5b3710af2bbaae5 upstream.

The driver tries to reuse code for disconnect in case
of a failed probe.
If resources need to be freed after an error in probe, the
netdev must not be freed because it has never been registered.
Fix it by telling the helper which path we are in.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 9ad1f093c4ae199f7cfeb6c35403a797ea0f5ac3..8aa2e85f61a74a4261aca3e91106319d8983abc3 100644 (file)
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2354,7 +2354,7 @@ static int remove_net_device(struct hso_device *hso_dev)
 }
 
 /* Frees our network device */
-static void hso_free_net_device(struct hso_device *hso_dev)
+static void hso_free_net_device(struct hso_device *hso_dev, bool bailout)
 {
        int i;
        struct hso_net *hso_net = dev2net(hso_dev);
@@ -2377,7 +2377,7 @@ static void hso_free_net_device(struct hso_device *hso_dev)
        kfree(hso_net->mux_bulk_tx_buf);
        hso_net->mux_bulk_tx_buf = NULL;
 
-       if (hso_net->net)
+       if (hso_net->net && !bailout)
                free_netdev(hso_net->net);
 
        kfree(hso_dev);
@@ -2553,7 +2553,7 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
 
        return hso_dev;
 exit:
-       hso_free_net_device(hso_dev);
+       hso_free_net_device(hso_dev, true);
        return NULL;
 }
 
@@ -3120,7 +3120,7 @@ static void hso_free_interface(struct usb_interface *interface)
                                rfkill_unregister(rfk);
                                rfkill_destroy(rfk);
                        }
-                       hso_free_net_device(network_table[i]);
+                       hso_free_net_device(network_table[i], false);
                }
        }
 }