The branch main has been updated by mav:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=884f38590c3cc0b1a2c00904c1f1f6c791376308

commit 884f38590c3cc0b1a2c00904c1f1f6c791376308
Author:     Alexander Motin <m...@freebsd.org>
AuthorDate: 2021-09-22 12:42:36 +0000
Commit:     Alexander Motin <m...@freebsd.org>
CommitDate: 2021-09-22 12:44:39 +0000

    Fix false device_set_unit() error.
    
    It should silently succeed if the current unit number is the same as
    requested, not fail immediately.
    
    MFC after:      1 week
---
 sys/kern/subr_bus.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 1f580f455dc0..5e1b561155bb 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -3145,6 +3145,8 @@ device_set_unit(device_t dev, int unit)
        devclass_t dc;
        int err;
 
+       if (unit == dev->unit)
+               return (0);
        dc = device_get_devclass(dev);
        if (unit < dc->maxunit && dc->devices[unit])
                return (EBUSY);
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"

Reply via email to