regulator: qcom_rpm: Don't update vreg->uV/mV if rpm_reg_write fails

[cascardo/linux.git] / drivers / thermal / int340x_thermal / acpi_thermal_rel.c

diff --git a/drivers/thermal/int340x_thermal/acpi_thermal_rel.c b/drivers/thermal/int340x_thermal/acpi_thermal_rel.c
index 0d8db80..e4e61b3 100644 (file)
--- a/drivers/thermal/int340x_thermal/acpi_thermal_rel.c
+++ b/drivers/thermal/int340x_thermal/acpi_thermal_rel.c
@@ -131,6 +131,8 @@ int acpi_parse_trt(acpi_handle handle, int *trt_count, struct trt **trtp,
                        pr_warn("Failed to get target ACPI device\n");
        }
 
+       result = 0;
+
        *trtp = trts;
        /* don't count bad entries */
        *trt_count -= nr_bad_entries;
@@ -317,21 +319,21 @@ static long acpi_thermal_rel_ioctl(struct file *f, unsigned int cmd,
 {
        int ret = 0;
        unsigned long length = 0;
-       unsigned long count = 0;
+       int count = 0;
        char __user *arg = (void __user *)__arg;
        struct trt *trts;
        struct art *arts;
 
        switch (cmd) {
        case ACPI_THERMAL_GET_TRT_COUNT:
-               ret = acpi_parse_trt(acpi_thermal_rel_handle, (int *)&count,
+               ret = acpi_parse_trt(acpi_thermal_rel_handle, &count,
                                &trts, false);
                kfree(trts);
                if (!ret)
                        return put_user(count, (unsigned long __user *)__arg);
                return ret;
        case ACPI_THERMAL_GET_TRT_LEN:
-               ret = acpi_parse_trt(acpi_thermal_rel_handle, (int *)&count,
+               ret = acpi_parse_trt(acpi_thermal_rel_handle, &count,
                                &trts, false);
                kfree(trts);
                length = count * sizeof(union trt_object);
@@ -341,14 +343,14 @@ static long acpi_thermal_rel_ioctl(struct file *f, unsigned int cmd,
        case ACPI_THERMAL_GET_TRT:
                return fill_trt(arg);
        case ACPI_THERMAL_GET_ART_COUNT:
-               ret = acpi_parse_art(acpi_thermal_rel_handle, (int *)&count,
+               ret = acpi_parse_art(acpi_thermal_rel_handle, &count,
                                &arts, false);
                kfree(arts);
                if (!ret)
                        return put_user(count, (unsigned long __user *)__arg);
                return ret;
        case ACPI_THERMAL_GET_ART_LEN:
-               ret = acpi_parse_art(acpi_thermal_rel_handle, (int *)&count,
+               ret = acpi_parse_art(acpi_thermal_rel_handle, &count,
                                &arts, false);
                kfree(arts);
                length = count * sizeof(union art_object);