On Thu, Mar 11, 2021 at 11:11:43AM +0200, Heikki Krogerus wrote: > On Thu, Mar 11, 2021 at 05:00:49PM +0800, Shawn Guo wrote: > > This reverts commit 8dc6e6dd1bee39cd65a232a17d51240fc65a0f4a. > > > > The commit causes an regression for ACPI probe on Lenovo Yoga C630 > > laptop. platform_device_add_properties() will fail with -EEXIST for the > > second USB instance, because of the software_node_to_swnode() check in > > function software_node_register(). > > I think you mean device_add_software_node() fails with -EEXIST, no? Yeah, I was looking at the wrong line. > > There should be already a fix for that: > https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=linux-next&id=2a92c90f2ecca4475d6050f2f93 > +8a1755a8954cc Cool! It fixes my problem. Hope it will land 5.12-rc soon. Shawn