diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2023-08-14 17:37:19 +0300 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2023-08-14 17:37:19 +0300 |
| commit | 65c6ea33e7f63799090158866cdcfdfe8d63ce16 (patch) | |
| tree | e79c2f7d086a8ce84f27d165842011584935057b /drivers/platform | |
| parent | 3f8587cb66427c92a64d0964ba5d9350aa3eb987 (diff) | |
| parent | f0ced885f5da250abb439e3a82b7dc9fc272aace (diff) | |
| download | linux-65c6ea33e7f63799090158866cdcfdfe8d63ce16.tar.xz | |
Merge remote-tracking branch 'pdx86/platform-drivers-x86-simatic-ipc' into review-hans
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/siemens/simatic-ipc-batt.c | 5 | ||||
| -rw-r--r-- | drivers/platform/x86/siemens/simatic-ipc.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/platform/x86/siemens/simatic-ipc-batt.c b/drivers/platform/x86/siemens/simatic-ipc-batt.c index d66b9969234b..ef28c806b383 100644 --- a/drivers/platform/x86/siemens/simatic-ipc-batt.c +++ b/drivers/platform/x86/siemens/simatic-ipc-batt.c @@ -194,11 +194,12 @@ int simatic_ipc_batt_probe(struct platform_device *pdev, struct gpiod_lookup_tab if (table->table[2].key) { flags = GPIOD_OUT_HIGH; - if (priv.devmode == SIMATIC_IPC_DEVICE_BX_21A || SIMATIC_IPC_DEVICE_BX_59A) + if (priv.devmode == SIMATIC_IPC_DEVICE_BX_21A || + priv.devmode == SIMATIC_IPC_DEVICE_BX_59A) flags = GPIOD_OUT_LOW; priv.gpios[2] = devm_gpiod_get_index(dev, "CMOSBattery meter", 2, flags); if (IS_ERR(priv.gpios[2])) { - err = PTR_ERR(priv.gpios[1]); + err = PTR_ERR(priv.gpios[2]); priv.gpios[2] = NULL; goto out; } diff --git a/drivers/platform/x86/siemens/simatic-ipc.c b/drivers/platform/x86/siemens/simatic-ipc.c index 02c540cf4070..8ca6e277fa03 100644 --- a/drivers/platform/x86/siemens/simatic-ipc.c +++ b/drivers/platform/x86/siemens/simatic-ipc.c @@ -129,7 +129,7 @@ static int register_platform_devices(u32 station_id) pdevname = KBUILD_MODNAME "_leds"; if (ledmode == SIMATIC_IPC_DEVICE_127E) pdevname = KBUILD_MODNAME "_leds_gpio_apollolake"; - if (ledmode == SIMATIC_IPC_DEVICE_227G || SIMATIC_IPC_DEVICE_BX_59A) + if (ledmode == SIMATIC_IPC_DEVICE_227G || ledmode == SIMATIC_IPC_DEVICE_BX_59A) pdevname = KBUILD_MODNAME "_leds_gpio_f7188x"; if (ledmode == SIMATIC_IPC_DEVICE_BX_21A) pdevname = KBUILD_MODNAME "_leds_gpio_elkhartlake"; |