Skip to content

Commit

Permalink
toshiba_acpi: Change touchpad store to check for invalid values
Browse files Browse the repository at this point in the history
The function toshiba_touchpad_store is not checking
for invalid values and simply returns silently.

This patch checks for invalid values and returns accordingly.

Signed-off-by: Azael Avalos <coproscefalo@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
  • Loading branch information
Azael Avalos authored and Darren Hart committed Sep 17, 2014
1 parent 1296287 commit c8a4166
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions drivers/platform/x86/toshiba_acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1343,12 +1343,18 @@ static ssize_t toshiba_touchpad_store(struct device *dev,
{
struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev);
int state;
int ret;

/* Set the TouchPad on/off, 0 - Disable | 1 - Enable */
if (sscanf(buf, "%i", &state) == 1 && (state == 0 || state == 1)) {
if (toshiba_touchpad_set(toshiba, state) < 0)
return -EIO;
}
ret = kstrtoint(buf, 0, &state);
if (ret)
return ret;
if (state != 0 && state != 1)
return -EINVAL;

ret = toshiba_touchpad_set(toshiba, state);
if (ret)
return ret;

return count;
}
Expand Down

0 comments on commit c8a4166

Please sign in to comment.