]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: rt2x00: drop redundant device reference
authorJohan Hovold <johan@kernel.org>
Fri, 6 Mar 2026 08:51:41 +0000 (09:51 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 6 Mar 2026 09:59:10 +0000 (10:59 +0100)
Driver core holds a reference to the USB interface and its parent USB
device while the interface is bound to a driver and there is no need to
take additional references unless the structures are needed after
disconnect.

Drop the redundant device reference to reduce cargo culting, make it
easier to spot drivers where an extra reference is needed, and reduce
the risk of memory leaks when drivers fail to release it.

Acked-by: Stanislaw Gruszka <stf_xl@wp.pl>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260306085144.12064-16-johan@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/ralink/rt2x00/rt2x00usb.c

index 54599cad78f980691c9e9d53da64fd3730afc8f8..83d00b6baf6424523c4f50ee734415f78dc631f2 100644 (file)
@@ -802,14 +802,12 @@ int rt2x00usb_probe(struct usb_interface *usb_intf,
        struct rt2x00_dev *rt2x00dev;
        int retval;
 
-       usb_dev = usb_get_dev(usb_dev);
        usb_reset_device(usb_dev);
 
        hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw);
        if (!hw) {
                rt2x00_probe_err("Failed to allocate hardware\n");
-               retval = -ENOMEM;
-               goto exit_put_device;
+               return -ENOMEM;
        }
 
        usb_set_intfdata(usb_intf, hw);
@@ -851,10 +849,6 @@ exit_free_reg:
 
 exit_free_device:
        ieee80211_free_hw(hw);
-
-exit_put_device:
-       usb_put_dev(usb_dev);
-
        usb_set_intfdata(usb_intf, NULL);
 
        return retval;
@@ -873,11 +867,7 @@ void rt2x00usb_disconnect(struct usb_interface *usb_intf)
        rt2x00usb_free_reg(rt2x00dev);
        ieee80211_free_hw(hw);
 
-       /*
-        * Free the USB device data.
-        */
        usb_set_intfdata(usb_intf, NULL);
-       usb_put_dev(interface_to_usbdev(usb_intf));
 }
 EXPORT_SYMBOL_GPL(rt2x00usb_disconnect);