aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorGravatar Paolo Abeni <pabeni@redhat.com> 2023-09-21 21:49:45 +0200
committerGravatar Paolo Abeni <pabeni@redhat.com> 2023-09-21 21:49:45 +0200
commite9cbc89067cce78211c8629c78e931c0fe64e29d (patch)
tree95662373d0a7b4adc589fec61e120586d476de71 /drivers/usb
parentnet: dsa: sja1105: make read-only const arrays static (diff)
parentMerge tag 'net-6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff)
downloadlinux-e9cbc89067cce78211c8629c78e931c0fe64e29d.tar.gz
linux-e9cbc89067cce78211c8629c78e931c0fe64e29d.tar.bz2
linux-e9cbc89067cce78211c8629c78e931c0fe64e29d.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. No conflicts. Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/typec/ucsi/debugfs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/typec/ucsi/debugfs.c b/drivers/usb/typec/ucsi/debugfs.c
index 0c7bf88d4a7f..f67733cecfdf 100644
--- a/drivers/usb/typec/ucsi/debugfs.c
+++ b/drivers/usb/typec/ucsi/debugfs.c
@@ -84,6 +84,9 @@ void ucsi_debugfs_register(struct ucsi *ucsi)
void ucsi_debugfs_unregister(struct ucsi *ucsi)
{
+ if (IS_ERR_OR_NULL(ucsi) || !ucsi->debugfs)
+ return;
+
debugfs_remove_recursive(ucsi->debugfs->dentry);
kfree(ucsi->debugfs);
}