From: Joshua Grisham Date: Mon, 3 Mar 2025 13:24:32 +0000 (+0100) Subject: platform/x86: samsung-galaxybook: Fix block_recording not supported logic X-Git-Tag: v6.15-rc1~172^2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bb84ca9b8d0cfff76a6108636aec1a5a8cdcd49;p=thirdparty%2Flinux.git platform/x86: samsung-galaxybook: Fix block_recording not supported logic Fixes logic error when block_recording is not supported but the fw attr was being added anyway (reported by GitHub user bbregeault). Tested myself on a Samsung Galaxy Book2 Pro (has block_recording) and by bbregeault on a Galaxy Book2 Business (does not have block_recording). Fixes: 56f529ce4370 ("platform/x86: samsung-galaxybook: Add samsung-galaxybook driver") Signed-off-by: Joshua Grisham Reviewed-by: Armin Wolf Link: https://lore.kernel.org/r/20250303132433.348653-1-josh@joshuagrisham.com Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen --- diff --git a/drivers/platform/x86/samsung-galaxybook.c b/drivers/platform/x86/samsung-galaxybook.c index de1ed2dc6cca4..5878a351993eb 100644 --- a/drivers/platform/x86/samsung-galaxybook.c +++ b/drivers/platform/x86/samsung-galaxybook.c @@ -1100,11 +1100,13 @@ static int galaxybook_fw_attrs_init(struct samsung_galaxybook *galaxybook) } err = galaxybook_block_recording_init(galaxybook); - if (!err) - galaxybook->has_block_recording = true; - else if (err != GB_NOT_SUPPORTED) + if (err == GB_NOT_SUPPORTED) + return 0; + else if (err) return err; + galaxybook->has_block_recording = true; + return galaxybook_fw_attr_init(galaxybook, GB_ATTR_BLOCK_RECORDING, &block_recording_acpi_get,