Skip to content

Commit 8c48938

Browse files
Wer-Wolfjwrdegoede
authored andcommitted
platform/x86: dell-ddv: Improve error handling
If for some reason a external function returns -ENODEV, no error message is being displayed because the driver assumes that -ENODEV can only be returned internally if no sensors, etc where found. Fix this by explicitly returning 0 in such a case since missing hardware is no error. Also remove the now obsolete check for -ENODEV. Signed-off-by: Armin Wolf <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Hans de Goede <[email protected]> Signed-off-by: Hans de Goede <[email protected]>
1 parent 5d3acd9 commit 8c48938

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/platform/x86/dell/dell-wmi-ddv.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,8 @@ static int dell_wmi_ddv_hwmon_add(struct dell_wmi_ddv_data *data)
616616
}
617617

618618
if (index < 2) {
619-
ret = -ENODEV;
619+
/* Finding no available sensors is not an error */
620+
ret = 0;
620621

621622
goto err_release;
622623
}
@@ -841,13 +842,13 @@ static int dell_wmi_ddv_probe(struct wmi_device *wdev, const void *context)
841842

842843
if (IS_REACHABLE(CONFIG_ACPI_BATTERY)) {
843844
ret = dell_wmi_ddv_battery_add(data);
844-
if (ret < 0 && ret != -ENODEV)
845+
if (ret < 0)
845846
dev_warn(&wdev->dev, "Unable to register ACPI battery hook: %d\n", ret);
846847
}
847848

848849
if (IS_REACHABLE(CONFIG_HWMON)) {
849850
ret = dell_wmi_ddv_hwmon_add(data);
850-
if (ret < 0 && ret != -ENODEV)
851+
if (ret < 0)
851852
dev_warn(&wdev->dev, "Unable to register hwmon interface: %d\n", ret);
852853
}
853854

0 commit comments

Comments
 (0)