From: Greg Kroah-Hartman Date: Tue, 7 Feb 2023 11:12:55 +0000 (+0100) Subject: fix up queue-5.10/bus-sunxi-rsb-fix-error-handling-in-sunxi_rsb_init.patch X-Git-Tag: v5.15.93~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cd7016154eaa3b6785149b4abce1a31e095a92e;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-5.10/bus-sunxi-rsb-fix-error-handling-in-sunxi_rsb_init.patch --- diff --git a/queue-5.10/bus-sunxi-rsb-fix-error-handling-in-sunxi_rsb_init.patch b/queue-5.10/bus-sunxi-rsb-fix-error-handling-in-sunxi_rsb_init.patch index ab237d5afaa..d132dff7c7c 100644 --- a/queue-5.10/bus-sunxi-rsb-fix-error-handling-in-sunxi_rsb_init.patch +++ b/queue-5.10/bus-sunxi-rsb-fix-error-handling-in-sunxi_rsb_init.patch @@ -19,12 +19,9 @@ Link: https://lore.kernel.org/r/20221123094200.12036-1-yuancan@huawei.com Signed-off-by: Jernej Skrabec Signed-off-by: Sasha Levin --- - drivers/bus/sunxi-rsb.c | 8 +++++++- - sound/soc/intel/boards/bytcr_rt5651.c | 2 +- - 2 files changed, 8 insertions(+), 2 deletions(-) + drivers/bus/sunxi-rsb.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) -diff --git a/drivers/bus/sunxi-rsb.c b/drivers/bus/sunxi-rsb.c -index f8c29b888e6b..98cbb18f17fa 100644 --- a/drivers/bus/sunxi-rsb.c +++ b/drivers/bus/sunxi-rsb.c @@ -781,7 +781,13 @@ static int __init sunxi_rsb_init(void) @@ -42,26 +39,3 @@ index f8c29b888e6b..98cbb18f17fa 100644 } module_init(sunxi_rsb_init); -diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c -index bf8b87d45cb0..2c76f0abeeca 100644 ---- a/sound/soc/intel/boards/bytcr_rt5651.c -+++ b/sound/soc/intel/boards/bytcr_rt5651.c -@@ -918,7 +918,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) - if (adev) { - snprintf(byt_rt5651_codec_name, sizeof(byt_rt5651_codec_name), - "i2c-%s", acpi_dev_name(adev)); -- put_device(&adev->dev); - byt_rt5651_dais[dai_index].codecs->name = byt_rt5651_codec_name; - } else { - dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id); -@@ -927,6 +926,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) - - codec_dev = bus_find_device_by_name(&i2c_bus_type, NULL, - byt_rt5651_codec_name); -+ acpi_dev_put(adev); - if (!codec_dev) - return -EPROBE_DEFER; - --- -2.39.0 -