From 1549b588c5d4d2efe690c2516c6897b2a4cf93fe Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=83=AD=E6=AF=85?= Date: Fri, 13 Jun 2014 16:50:38 +0800 Subject: [PATCH] sensor: modify some warnings of sensor_dev.c --- drivers/input/sensors/sensor-dev.c | 2 +- include/linux/sensor-dev.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/sensors/sensor-dev.c b/drivers/input/sensors/sensor-dev.c index 020e3f13adf3..02b0e0d8df49 100755 --- a/drivers/input/sensors/sensor-dev.c +++ b/drivers/input/sensors/sensor-dev.c @@ -1693,7 +1693,7 @@ int sensor_probe(struct i2c_client *client, const struct i2c_device_id *devid) of_property_read_u32(np,"layout",&(pdata->layout)); of_property_read_u8(np,"address",&(pdata->address)); - pdata->project_name = of_get_property(np, "project_name", NULL); + of_get_property(np, "project_name", pdata->project_name); switch(pdata->layout) diff --git a/include/linux/sensor-dev.h b/include/linux/sensor-dev.h index 2c3cb4b5348e..e49a6d526e73 100755 --- a/include/linux/sensor-dev.h +++ b/include/linux/sensor-dev.h @@ -197,7 +197,7 @@ struct sensor_platform_data { unsigned long irq_flags; signed char orientation[9]; short m_layout[4][3][3]; - char* project_name; + int* project_name; }; struct gsensor_platform_data { -- 2.34.1