lkml.org 
[lkml]   [2011]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
Subject[PATCH] power_supply: add "unknown" in power supply type
Hi, Anton

For the default value of power supply type, "unknown" is added.
With default prop value, supply type property can be displayed as default - "Unknown".

And union propval is set to zero.
Then no data abort exception even if the propval is not updated by xxx_get_property().

Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
---
drivers/power/power_supply_sysfs.c | 4 +++-
include/linux/power_supply.h | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 58cc490..6250686 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -42,7 +42,7 @@ static ssize_t power_supply_show_property(struct device *dev,
struct device_attribute *attr,
char *buf) {
static char *type_text[] = {
- "Battery", "UPS", "Mains", "USB",
+ "Unknown", "Battery", "UPS", "Mains", "USB",
"USB_DCP", "USB_CDP", "USB_ACA"
};
static char *status_text[] = {
@@ -67,6 +67,8 @@ static ssize_t power_supply_show_property(struct device *dev,
const ptrdiff_t off = attr - power_supply_attrs;
union power_supply_propval value;

+ memset(&value, 0, sizeof(value));
+
if (off == POWER_SUPPLY_PROP_TYPE)
value.intval = psy->type;
else
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 204c18d..9c83e04 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -123,7 +123,8 @@ enum power_supply_property {
};

enum power_supply_type {
- POWER_SUPPLY_TYPE_BATTERY = 0,
+ POWER_SUPPLY_TYPE_UNKNOWN = 0,
+ POWER_SUPPLY_TYPE_BATTERY,
POWER_SUPPLY_TYPE_UPS,
POWER_SUPPLY_TYPE_MAINS,
POWER_SUPPLY_TYPE_USB, /* Standard Downstream Port */
--
1.7.4.1

Best Regards

Milo (Woogyom) Kim
Texas Instruments Incorporated






\
 
 \ /
  Last update: 2011-12-01 08:11    [W:0.030 / U:0.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site