diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2023-08-23 18:30:50 +0300 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2023-08-23 18:30:50 +0300 |
| commit | b0c7f1d9d742911dd22703bf8b25ea85ae2363dd (patch) | |
| tree | 6de0444803bb3211f9914bcc610f7e4f4a150f45 /drivers/platform/x86/dell | |
| parent | 559eed7776c6557acf58e86c48ddaed9301550fd (diff) | |
| parent | 0848cab765c634597636810bf76d0934003cce28 (diff) | |
| download | linux-b0c7f1d9d742911dd22703bf8b25ea85ae2363dd.tar.xz | |
Merge remote-tracking branch 'pdx86/fixes' into pdx86/for-next
Merge pdx86/fixes into pdx86/for-next because there are some
pdx86 patches pending for the next release which build on top
of some of the fixes.
Diffstat (limited to 'drivers/platform/x86/dell')
| -rw-r--r-- | drivers/platform/x86/dell/dell-wmi-ddv.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/platform/x86/dell/dell-wmi-ddv.c b/drivers/platform/x86/dell/dell-wmi-ddv.c index 2750dee99c3e..db1e9240dd02 100644 --- a/drivers/platform/x86/dell/dell-wmi-ddv.c +++ b/drivers/platform/x86/dell/dell-wmi-ddv.c @@ -616,7 +616,8 @@ static int dell_wmi_ddv_hwmon_add(struct dell_wmi_ddv_data *data) } if (index < 2) { - ret = -ENODEV; + /* Finding no available sensors is not an error */ + ret = 0; goto err_release; } @@ -841,13 +842,13 @@ static int dell_wmi_ddv_probe(struct wmi_device *wdev, const void *context) if (IS_REACHABLE(CONFIG_ACPI_BATTERY)) { ret = dell_wmi_ddv_battery_add(data); - if (ret < 0 && ret != -ENODEV) + if (ret < 0) dev_warn(&wdev->dev, "Unable to register ACPI battery hook: %d\n", ret); } if (IS_REACHABLE(CONFIG_HWMON)) { ret = dell_wmi_ddv_hwmon_add(data); - if (ret < 0 && ret != -ENODEV) + if (ret < 0) dev_warn(&wdev->dev, "Unable to register hwmon interface: %d\n", ret); } |