summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2025-02-20 13:03:14 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-03-13 12:53:21 +0100
commit79d07d7f3076efb952f46fd8dd7414620f3728ec (patch)
treed4551f13b2d7a510cf0038b1cc7d4232cfa81c92 /drivers
parentb589d499458ab638b7f38f89e5d3650a5406c2d6 (diff)
downloadlinux-79d07d7f3076efb952f46fd8dd7414620f3728ec.tar.gz
linux-79d07d7f3076efb952f46fd8dd7414620f3728ec.tar.bz2
linux-79d07d7f3076efb952f46fd8dd7414620f3728ec.zip
usb: gadget: Fix setting self-powered state on suspend
commit c783e1258f29c5caac9eea0aea6b172870f1baf8 upstream. cdev->config might be NULL, so check it before dereferencing. CC: stable <stable@kernel.org> Fixes: 40e89ff5750f ("usb: gadget: Set self-powered based on MaxPower and bmAttributes") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Link: https://lore.kernel.org/r/20250220120314.3614330-1-m.szyprowski@samsung.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/composite.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 9520e4d21542..3c62836fc336 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -2491,7 +2491,8 @@ void composite_suspend(struct usb_gadget *gadget)
cdev->suspended = 1;
- if (cdev->config->bmAttributes & USB_CONFIG_ATT_SELFPOWER)
+ if (cdev->config &&
+ cdev->config->bmAttributes & USB_CONFIG_ATT_SELFPOWER)
usb_gadget_set_selfpowered(gadget);
usb_gadget_vbus_draw(gadget, 2);