summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Grisham <josh@joshuagrisham.com>2025-03-03 14:24:32 +0100
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>2025-03-05 14:13:34 +0200
commit7bb84ca9b8d0cfff76a6108636aec1a5a8cdcd49 (patch)
tree3927ee7d3a2728db4a2c59a5f6681d049d06240f
parent4878e0b14c3e31a87ab147bd2dae443394cb5a2c (diff)
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 <josh@joshuagrisham.com> Reviewed-by: Armin Wolf <W_Armin@gmx.de> Link: https://lore.kernel.org/r/20250303132433.348653-1-josh@joshuagrisham.com Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
-rw-r--r--drivers/platform/x86/samsung-galaxybook.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/platform/x86/samsung-galaxybook.c b/drivers/platform/x86/samsung-galaxybook.c
index de1ed2dc6cca..5878a351993e 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,