4 files changed, 18 insertions, 12 deletions

diff --git a/drivers/hwmon/lineage-pem.c b/drivers/hwmon/lineage-pem.c
index 41df29f59b0e..ebbb9f4f27a3 100644
--- a/drivers/hwmon/lineage-pem.c
+++ b/drivers/hwmon/lineage-pem.c
@@ -422,6 +422,7 @@ static struct attribute *pem_input_attributes[] = {
         &sensor_dev_attr_in2_input.dev_attr.attr,
         &sensor_dev_attr_curr1_input.dev_attr.attr,
         &sensor_dev_attr_power1_input.dev_attr.attr,
+        NULL
 };
 
 static const struct attribute_group pem_input_group = {
@@ -432,6 +433,7 @@ static struct attribute *pem_fan_attributes[] = {
         &sensor_dev_attr_fan1_input.dev_attr.attr,
         &sensor_dev_attr_fan2_input.dev_attr.attr,
         &sensor_dev_attr_fan3_input.dev_attr.attr,
+        NULL
 };
 
 static const struct attribute_group pem_fan_group = {
diff --git a/drivers/hwmon/lm75.h b/drivers/hwmon/lm75.h
index 668ff4721323..5cde94e56f17 100644
--- a/drivers/hwmon/lm75.h
+++ b/drivers/hwmon/lm75.h
@@ -25,7 +25,7 @@
     which contains this code, we don't worry about the wasted space.
 */
 
-#include <linux/hwmon.h>
+#include <linux/kernel.h>
 
 /* straight from the datasheet */
 #define LM75_TEMP_MIN (-55000)
diff --git a/drivers/hwmon/pmbus/ltc2978.c b/drivers/hwmon/pmbus/ltc2978.c
index a58de38e23d8..6d6130752f94 100644
--- a/drivers/hwmon/pmbus/ltc2978.c
+++ b/drivers/hwmon/pmbus/ltc2978.c
@@ -59,7 +59,7 @@ enum chips { ltc2978, ltc3880 };
 struct ltc2978_data {
         enum chips id;
         int vin_min, vin_max;
-        int temp_min, temp_max;
+        int temp_min, temp_max[2];
         int vout_min[8], vout_max[8];
         int iout_max[2];
         int temp2_max;
@@ -113,9 +113,10 @@ static int ltc2978_read_word_data_common(struct i2c_client *client, int page,
                 ret = pmbus_read_word_data(client, page,
                                            LTC2978_MFR_TEMPERATURE_PEAK);
                 if (ret >= 0) {
-                        if (lin11_to_val(ret) > lin11_to_val(data->temp_max))
-                                data->temp_max = ret;
-                        ret = data->temp_max;
+                        if (lin11_to_val(ret)
+                            > lin11_to_val(data->temp_max[page]))
+                                data->temp_max[page] = ret;
+                        ret = data->temp_max[page];
                 }
                 break;
         case PMBUS_VIRT_RESET_VOUT_HISTORY:
@@ -266,7 +267,7 @@ static int ltc2978_write_word_data(struct i2c_client *client, int page,
                 break;
         case PMBUS_VIRT_RESET_TEMP_HISTORY:
                 data->temp_min = 0x7bff;
-                data->temp_max = 0x7c00;
+                data->temp_max[page] = 0x7c00;
                 ret = ltc2978_clear_peaks(client, page, data->id);
                 break;
         default:
@@ -323,7 +324,8 @@ static int ltc2978_probe(struct i2c_client *client,
         data->vin_min = 0x7bff;
         data->vin_max = 0x7c00;
         data->temp_min = 0x7bff;
-        data->temp_max = 0x7c00;
+        for (i = 0; i < ARRAY_SIZE(data->temp_max); i++)
+                data->temp_max[i] = 0x7c00;
         data->temp2_max = 0x7c00;
 
         switch (data->id) {
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index 80eef50c50fd..9add60920ac0 100644
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -766,12 +766,14 @@ static ssize_t pmbus_show_label(struct device *dev,
 static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
 {
         if (data->num_attributes >= data->max_attributes - 1) {
-                data->max_attributes += PMBUS_ATTR_ALLOC_SIZE;
-                data->group.attrs = krealloc(data->group.attrs,
-                                             sizeof(struct attribute *) *
-                                             data->max_attributes, GFP_KERNEL);
-                if (data->group.attrs == NULL)
+                int new_max_attrs = data->max_attributes + PMBUS_ATTR_ALLOC_SIZE;
+                void *new_attrs = krealloc(data->group.attrs,
+                                           new_max_attrs * sizeof(void *),
+                                           GFP_KERNEL);
+                if (!new_attrs)
                         return -ENOMEM;
+                data->group.attrs = new_attrs;
+                data->max_attributes = new_max_attrs;
         }
 
         data->group.attrs[data->num_attributes++] = attr;