diff options
| author | Petr Mladek <[email protected]> | 2021-11-02 09:39:27 +0000 |
|---|---|---|
| committer | Petr Mladek <[email protected]> | 2021-11-02 09:39:27 +0000 |
| commit | 40e64a88dadcfa168914065baf7f035de957bbe0 (patch) | |
| tree | 06c8c4a9e6c1b478aa6851794c6a33bec1ce6ec4 /drivers/platform/surface/surface3_power.c | |
| parent | lib/vsprintf.c: Amend static asserts for format specifier flags (diff) | |
| parent | vsprintf: Update %pGp documentation about that it prints hex value (diff) | |
| download | kernel-40e64a88dadcfa168914065baf7f035de957bbe0.tar.gz kernel-40e64a88dadcfa168914065baf7f035de957bbe0.zip | |
Merge branch 'for-5.16-vsprintf-pgp' into for-linus
Diffstat (limited to 'drivers/platform/surface/surface3_power.c')
| -rw-r--r-- | drivers/platform/surface/surface3_power.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/platform/surface/surface3_power.c b/drivers/platform/surface/surface3_power.c index dea82aa1abd4..90c1568ea4e0 100644 --- a/drivers/platform/surface/surface3_power.c +++ b/drivers/platform/surface/surface3_power.c @@ -384,13 +384,7 @@ mshw0011_space_handler(u32 function, acpi_physical_address command, if (ACPI_FAILURE(ret)) return ret; - if (!value64 || ares->type != ACPI_RESOURCE_TYPE_SERIAL_BUS) { - ret = AE_BAD_PARAMETER; - goto err; - } - - sb = &ares->data.i2c_serial_bus; - if (sb->type != ACPI_RESOURCE_SERIAL_TYPE_I2C) { + if (!value64 || !i2c_acpi_get_i2c_resource(ares, &sb)) { ret = AE_BAD_PARAMETER; goto err; } |