[ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: 3de0f2627ef849735f155c1818247f58404dddfe WARNING: Author mismatch between patch and upstream commit: Backport author: Bin Lan <bin.lan.cn@xxxxxxxxxxxxx> Commit author: Hans de Goede <hdegoede@xxxxxxxxxx> Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.11.y | Present (exact SHA1) 6.6.y | Not found Note: The patch differs from the upstream commit: --- --- - 2024-11-25 08:51:45.872698411 -0500 +++ /tmp/tmp.lymTd90W4F 2024-11-25 08:51:45.865383382 -0500 @@ -1,3 +1,5 @@ +[ Upstream commit 3de0f2627ef849735f155c1818247f58404dddfe ] + Not all subsystems support a device getting removed while there are still consumers of the device with a reference to the device. @@ -45,15 +47,17 @@ Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx> Link: https://lore.kernel.org/r/20240406125058.13624-1-hdegoede@xxxxxxxxxx +[ Resolve minor conflicts ] +Signed-off-by: Bin Lan <bin.lan.cn@xxxxxxxxxxxxx> --- - drivers/platform/x86/x86-android-tablets/core.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + drivers/platform/x86/x86-android-tablets/core.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/x86-android-tablets/core.c b/drivers/platform/x86/x86-android-tablets/core.c -index a3415f1c0b5f8..6559bb4ea7305 100644 +index a0fa0b6859c9..63a348af83db 100644 --- a/drivers/platform/x86/x86-android-tablets/core.c +++ b/drivers/platform/x86/x86-android-tablets/core.c -@@ -278,25 +278,25 @@ static void x86_android_tablet_remove(struct platform_device *pdev) +@@ -230,20 +230,20 @@ static void x86_android_tablet_remove(struct platform_device *pdev) { int i; @@ -72,14 +76,11 @@ kfree(pdevs); kfree(buttons); -- for (i = 0; i < spi_dev_count; i++) -+ for (i = spi_dev_count - 1; i >= 0; i--) - spi_unregister_device(spi_devs[i]); - - kfree(spi_devs); - - for (i = 0; i < i2c_client_count; i++) + for (i = i2c_client_count - 1; i >= 0; i--) i2c_unregister_device(i2c_clients[i]); kfree(i2c_clients); +-- +2.43.0 + --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |
