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

Commit 04a820ea authored by Andres Salomon's avatar Andres Salomon Committed by Anton Vorontsov
Browse files

olpc_battery: Fix up eeprom read function 



The eeprom read function was placing values into the wrong place in
'buf'; we were starting from buf[off], rather than buf[0].

Also, the for loop that we were using was much uglier than it needed to
be.  This cleans it up a bit.

Signed-off-by: default avatarAndres Salomon <dilinger@collabora.co.uk>
Signed-off-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
parent 5a4f13fa

drivers/power/olpc_battery.c

+9 −8
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/err.h>

#include <linux/platform_device.h>
@@ -334,21 +335,21 @@ static ssize_t olpc_bat_eeprom_read(struct kobject *kobj, 
		struct bin_attribute *attr, char *buf, loff_t off, size_t count)

{

	uint8_t ec_byte;

	int ret, end;

	int ret;

	int i;



	if (off >= EEPROM_SIZE)

		return 0;

	if (off + count > EEPROM_SIZE)

		count = EEPROM_SIZE - off;



	end = EEPROM_START + off + count;

	for (ec_byte = EEPROM_START + off; ec_byte < end; ec_byte++) {

		ret = olpc_ec_cmd(EC_BAT_EEPROM, &ec_byte, 1,

				&buf[ec_byte - EEPROM_START], 1);

	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);

		if (ret) {

			printk(KERN_ERR "olpc-battery:  EC command "

					"EC_BAT_EEPROM @ 0x%x failed -"

					" %d!\n", ec_byte, ret);

			pr_err("olpc-battery: "

			       "EC_BAT_EEPROM cmd @ 0x%x failed - %d!\n",

			       ec_byte, ret);

			return -EIO;

		}

	}