Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / drivers / hwmon / oxp-sensors.c

diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/hwmon/oxp-sensors.c
index 584e48d..e1a907c 100644 (file)
--- a/drivers/hwmon/oxp-sensors.c
+++ b/drivers/hwmon/oxp-sensors.c
@@ -77,6 +77,13 @@ static const struct dmi_system_id dmi_table[] = {
                },
                .driver_data = (void *)aok_zoe_a1,
        },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "AOKZOE"),
+                       DMI_EXACT_MATCH(DMI_BOARD_NAME, "AOKZOE A1 Pro"),
+               },
+               .driver_data = (void *)aok_zoe_a1,
+       },
        {
                .matches = {
                        DMI_MATCH(DMI_BOARD_VENDOR, "AYANEO"),
@@ -226,13 +233,12 @@ static ssize_t tt_toggle_store(struct device *dev,
 
        if (value) {
                rval = tt_toggle_enable();
-               if (rval)
-                       return rval;
        } else {
                rval = tt_toggle_disable();
-               if (rval)
-                       return rval;
        }
+       if (rval)
+               return rval;
+
        return count;
 }