[netdrvr] usb/hso: Cleanup rfkill error handling

Yup, this appears to be the problem, thanks. I think &hso_net->net->dev
is more intuitive for the error message, so I've used that. I've also
added missing line endings on the error messages and set our local
rfkill structure element to NULL on failure so we don't try to call
rfkill_unregister on driver removal if we failed to register at all.

The patch below Works For Me (TM); the device is detected fine, can be
removed without problems and connects ok. I'll have a prod at why the
rfkill stuff isn't working next, but I believe this cleanup of the error
handling is appropriate no matter what the issue with registration is.

Signed-Off-By: Jonathan McDowell <noodles@earth.li>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 3f49e8382dd8ccc62ad2532c6650b12d584e636b..8e90891f0e422b8cc0f645c9eab388ff39b22d45 100644 (file)
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2184,19 +2184,20 @@ static void hso_create_rfkill(struct hso_device *hso_dev,
                             struct usb_interface *interface)
 {
        struct hso_net *hso_net = dev2net(hso_dev);
-       struct device *dev = hso_dev->dev;
+       struct device *dev = &hso_net->net->dev;
        char *rfkn;
 
        hso_net->rfkill = rfkill_allocate(&interface_to_usbdev(interface)->dev,
                                 RFKILL_TYPE_WWAN);
        if (!hso_net->rfkill) {
-               dev_err(dev, "%s - Out of memory", __func__);
+               dev_err(dev, "%s - Out of memory\n", __func__);
                return;
        }
        rfkn = kzalloc(20, GFP_KERNEL);
        if (!rfkn) {
                rfkill_free(hso_net->rfkill);
-               dev_err(dev, "%s - Out of memory", __func__);
+               hso_net->rfkill = NULL;
+               dev_err(dev, "%s - Out of memory\n", __func__);
                return;
        }
        snprintf(rfkn, 20, "hso-%d",
@@ -2209,7 +2210,8 @@ static void hso_create_rfkill(struct hso_device *hso_dev,
                kfree(rfkn);
                hso_net->rfkill->name = NULL;
                rfkill_free(hso_net->rfkill);
-               dev_err(dev, "%s - Failed to register rfkill", __func__);
+               hso_net->rfkill = NULL;
+               dev_err(dev, "%s - Failed to register rfkill\n", __func__);
                return;
        }
 }