From 689255a05ced38e973029e04e8cc6c7cfc4d02d6 Mon Sep 17 00:00:00 2001 From: Ashay Jaiswal Date: Wed, 2 Apr 2014 11:29:26 +0530 Subject: [PATCH] power: vm-bms: Update vm-bms to support 64 bit Add compat_ioctl in batterdata-interface to support 64-bit kernel and 32-bit userspace. Fix return type of vm_bms_read operation. Change-Id: I56dca1fb8e17e52ca27aa722c3a17dd845959421 Signed-off-by: Ashay Jaiswal --- drivers/power/batterydata-interface.c | 3 ++- drivers/power/qpnp-vm-bms.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/power/batterydata-interface.c b/drivers/power/batterydata-interface.c index 74550ac347d7..e4c763287248 100644 --- a/drivers/power/batterydata-interface.c +++ b/drivers/power/batterydata-interface.c @@ -129,7 +129,8 @@ static int battery_data_release(struct inode *inode, struct file *file) static const struct file_operations battery_data_fops = { .owner = THIS_MODULE, .open = battery_data_open, - .unlocked_ioctl = battery_data_ioctl, + .unlocked_ioctl = battery_data_ioctl, + .compat_ioctl = battery_data_ioctl, .release = battery_data_release, }; diff --git a/drivers/power/qpnp-vm-bms.c b/drivers/power/qpnp-vm-bms.c index 8bb56f30e687..fcd914a68668 100644 --- a/drivers/power/qpnp-vm-bms.c +++ b/drivers/power/qpnp-vm-bms.c @@ -1988,7 +1988,7 @@ static int bms_load_hw_defaults(struct qpnp_bms_chip *chip) return 0; } -static int vm_bms_read(struct file *file, char __user *buf, size_t count, +static ssize_t vm_bms_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) { int rc;