Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 674d0ed8 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (atxp1) Set and use error code from vid_to_reg()



vid_to_reg() returns -1 if it encounters an error. Return -EINVAL instead.
Its only caller, atxp1_storevcore(), doesn't use the return code but
returns -1 instead, which is wrong anyway as it means -EPERM.
Use the return value from vid_to_reg() instead to report the error.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarJean Delvare <khali@linux-fr.org>
parent 19f053c8
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -147,10 +147,9 @@ static ssize_t atxp1_storevcore(struct device *dev,

	/* Calculate VID */
	vid = vid_to_reg(vcore, data->vrm);

	if (vid < 0) {
		dev_err(dev, "VID calculation failed.\n");
		return -1;
		return vid;
	}

	/*
+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static inline int vid_to_reg(int val, u8 vrm)
		return ((val >= 1100) && (val <= 1850) ?
			((18499 - val * 10) / 25 + 5) / 10 : -1);
	default:
		return -1;
		return -EINVAL;
	}
}