| Message ID | 20160415144720.GF8953@mwanda (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Fri, Apr 15, 2016 at 05:47:20PM +0300, Dan Carpenter wrote: > If acpi_evaluate_integer() fails then "lret" isn't initialized. I've > tweaked the error handling to avoid this issue. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Thanks Dan, I verified and queued all 3 patches to fixes for 4.6. > > diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp_accel.c > index 10ce6cb..746918e 100644 > --- a/drivers/platform/x86/hp_accel.c > +++ b/drivers/platform/x86/hp_accel.c > @@ -127,8 +127,10 @@ static int lis3lv02d_acpi_read(struct lis3lv02d *lis3, int reg, u8 *ret) > arg0.integer.value = reg; > > status = acpi_evaluate_integer(dev->handle, "ALRD", &args, &lret); > + if (ACPI_FAILURE(status)) > + return -EINVAL; > *ret = lret; > - return (status != AE_OK) ? -EINVAL : 0; > + return 0; > } > > /** >
diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp_accel.c index 10ce6cb..746918e 100644 --- a/drivers/platform/x86/hp_accel.c +++ b/drivers/platform/x86/hp_accel.c @@ -127,8 +127,10 @@ static int lis3lv02d_acpi_read(struct lis3lv02d *lis3, int reg, u8 *ret) arg0.integer.value = reg; status = acpi_evaluate_integer(dev->handle, "ALRD", &args, &lret); + if (ACPI_FAILURE(status)) + return -EINVAL; *ret = lret; - return (status != AE_OK) ? -EINVAL : 0; + return 0; } /**
If acpi_evaluate_integer() fails then "lret" isn't initialized. I've tweaked the error handling to avoid this issue. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -- To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html