]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: usb: aqc111: debug info before sanitation
authorOliver Neukum <oneukum@suse.com>
Wed, 28 May 2025 11:03:54 +0000 (13:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:04:11 +0000 (11:04 +0100)
commit d3faab9b5a6a0477d69c38bd11c43aa5e936f929 upstream.

If we sanitize error returns, the debug statements need
to come before that so that we don't lose information.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Fixes: 405b0d610745 ("net: usb: aqc111: fix error handling of usbnet read calls")
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/usb/aqc111.c

index 279fcb9bf3be6a1884b401fcb081099eb7ec40a5..485959771431db5d1e46fa77b4701c5bf8a4e3f0 100644 (file)
@@ -31,11 +31,11 @@ static int aqc111_read_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value,
                                   USB_RECIP_DEVICE, value, index, data, size);
 
        if (unlikely(ret < size)) {
-               ret = ret < 0 ? ret : -ENODATA;
-
                netdev_warn(dev->net,
                            "Failed to read(0x%x) reg index 0x%04x: %d\n",
                            cmd, index, ret);
+
+               ret = ret < 0 ? ret : -ENODATA;
        }
 
        return ret;
@@ -50,11 +50,11 @@ static int aqc111_read_cmd(struct usbnet *dev, u8 cmd, u16 value,
                              USB_RECIP_DEVICE, value, index, data, size);
 
        if (unlikely(ret < size)) {
-               ret = ret < 0 ? ret : -ENODATA;
-
                netdev_warn(dev->net,
                            "Failed to read(0x%x) reg index 0x%04x: %d\n",
                            cmd, index, ret);
+
+               ret = ret < 0 ? ret : -ENODATA;
        }
 
        return ret;