diff options
author | Wolfram Sang <wsa@kernel.org> | 2022-09-27 21:33:37 +0200 |
---|---|---|
committer | Wolfram Sang <wsa@kernel.org> | 2022-09-27 21:33:37 +0200 |
commit | 85f17d677f6c40069287617630f202eb20fcfe36 (patch) | |
tree | a0a7de12ddf19068b14124d7a64d79cf697e0710 /drivers/usb/core/hub.c | |
parent | macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change (diff) | |
parent | Linux 6.0-rc7 (diff) | |
download | linux-dev-85f17d677f6c40069287617630f202eb20fcfe36.tar.xz linux-dev-85f17d677f6c40069287617630f202eb20fcfe36.zip |
Merge branch 'master' into i2c/for-mergewindow
Diffstat (limited to 'drivers/usb/core/hub.c')
-rw-r--r-- | drivers/usb/core/hub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index d4b1e70d1498..bbab424b0d55 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -6039,7 +6039,7 @@ re_enumerate: * * Return: The same as for usb_reset_and_verify_device(). * However, if a reset is already in progress (for instance, if a - * driver doesn't have pre_ or post_reset() callbacks, and while + * driver doesn't have pre_reset() or post_reset() callbacks, and while * being unbound or re-bound during the ongoing reset its disconnect() * or probe() routine tries to perform a second, nested reset), the * routine returns -EINPROGRESS. |