| From e64daad660a0c9ace3acdc57099fffe5ed83f977 Mon Sep 17 00:00:00 2001 |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| Date: Fri, 16 Jul 2021 14:44:07 +0300 |
| Subject: driver core: Prevent warning when removing a device link from unregistered consumer |
| |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| |
| commit e64daad660a0c9ace3acdc57099fffe5ed83f977 upstream. |
| |
| sysfs_remove_link() causes a warning if the parent directory does not |
| exist. That can happen if the device link consumer has not been registered. |
| So do not attempt sysfs_remove_link() in that case. |
| |
| Fixes: 287905e68dd29 ("driver core: Expose device link details in sysfs") |
| Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> |
| Cc: stable@vger.kernel.org # 5.9+ |
| Reviewed-by: Rafael J. Wysocki <rafael@kernel.org> |
| Link: https://lore.kernel.org/r/20210716114408.17320-2-adrian.hunter@intel.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/base/core.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/base/core.c |
| +++ b/drivers/base/core.c |
| @@ -574,8 +574,10 @@ static void devlink_remove_symlinks(stru |
| return; |
| } |
| |
| - snprintf(buf, len, "supplier:%s:%s", dev_bus_name(sup), dev_name(sup)); |
| - sysfs_remove_link(&con->kobj, buf); |
| + if (device_is_registered(con)) { |
| + snprintf(buf, len, "supplier:%s:%s", dev_bus_name(sup), dev_name(sup)); |
| + sysfs_remove_link(&con->kobj, buf); |
| + } |
| snprintf(buf, len, "consumer:%s:%s", dev_bus_name(con), dev_name(con)); |
| sysfs_remove_link(&sup->kobj, buf); |
| kfree(buf); |
