Merge tag 'regmap-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

[cascardo/linux.git] / drivers / hwmon / applesmc.c

diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index b989553..f082e48 100644 (file)
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -344,8 +344,10 @@ static int applesmc_get_lower_bound(unsigned int *lo, const char *key)
        while (begin != end) {
                int middle = begin + (end - begin) / 2;
                entry = applesmc_get_entry_by_index(middle);
-               if (IS_ERR(entry))
+               if (IS_ERR(entry)) {
+                       *lo = 0;
                        return PTR_ERR(entry);
+               }
                if (strcmp(entry->key, key) < 0)
                        begin = middle + 1;
                else
@@ -364,8 +366,10 @@ static int applesmc_get_upper_bound(unsigned int *hi, const char *key)
        while (begin != end) {
                int middle = begin + (end - begin) / 2;
                entry = applesmc_get_entry_by_index(middle);
-               if (IS_ERR(entry))
+               if (IS_ERR(entry)) {
+                       *hi = smcreg.key_count;
                        return PTR_ERR(entry);
+               }
                if (strcmp(key, entry->key) < 0)
                        end = middle;
                else
@@ -1189,8 +1193,10 @@ static int applesmc_dmi_match(const struct dmi_system_id *id)
        return 1;
 }
 
-/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
- * So we need to put "Apple MacBook Pro" before "Apple MacBook". */
+/*
+ * Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
+ * So we need to put "Apple MacBook Pro" before "Apple MacBook".
+ */
 static __initdata struct dmi_system_id applesmc_whitelist[] = {
        { applesmc_dmi_match, "Apple MacBook Air", {
          DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),