summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vz@mleia.com>2015-07-27 00:26:49 +0300
committerSebastian Reichel <sre@kernel.org>2015-07-27 17:28:54 +0300
commit3e1d9c6f241961e2e21b8df9de5ee12e3dc6f177 (patch)
treea4d372e6327efbca685cbb2e7f5baa8556d8485c /drivers/power
parent9f28b86552aef94733387814a57755cb0019cfb9 (diff)
downloadlinux-3e1d9c6f241961e2e21b8df9de5ee12e3dc6f177.tar.xz
power: olpc_battery: clean up eeprom read function
The change removes redundant sysfs binary file boundary check while reading eeprom content from userspace, the check is done on caller side in fs/sysfs/file.c, if binary attribute size is not zero. Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/olpc_battery.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c
index a944338a39de..9e29b1321648 100644
--- a/drivers/power/olpc_battery.c
+++ b/drivers/power/olpc_battery.c
@@ -521,11 +521,6 @@ static ssize_t olpc_bat_eeprom_read(struct file *filp, struct kobject *kobj,
int ret;
int i;
- if (off >= EEPROM_SIZE)
- return 0;
- if (off + count > EEPROM_SIZE)
- count = EEPROM_SIZE - off;
-
for (i = 0; i < count; i++) {
ec_byte = EEPROM_START + off + i;
ret = olpc_ec_cmd(EC_BAT_EEPROM, &ec_byte, 1, &buf[i], 1);
@@ -545,7 +540,7 @@ static struct bin_attribute olpc_bat_eeprom = {
.name = "eeprom",
.mode = S_IRUGO,
},
- .size = 0,
+ .size = EEPROM_SIZE,
.read = olpc_bat_eeprom_read,
};