shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

sensors:fix NULL pointer problem of compass

Browse Source
This commit is contained in:
luowei
2013-03-11 19:25:31 +08:00
parent 5f3d1582fe
commit 9aa47e216e
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/input/sensors/compass/ak8963.c
View File

@@ -127,6 +127,7 @@ Defines a read-only address of the fuse ROM of the AK8963.*/
#define AK8963_DEVICE_ID 0x48
static struct i2c_client *this_client;
static struct miscdevice compass_dev_device;
static short g_akm_rbuf[12];
@@ -182,9 +183,15 @@ static int sensor_init(struct i2c_client *client)
if((info & (0x0f<<3)) != AK8963_INFO_DATA)
{
printk("%s:info=0x%x,it is not %s\n",__func__, info, sensor->ops->name);
result = -1;
return -1;
}
result = misc_register(&compass_dev_device);
if (result < 0) {
printk("%s:fail to register misc device %s\n", __func__, compass_dev_device.name);
result = -1;
}
DBG("%s:status_cur=%d\n",__func__, sensor->status_cur);
return result;
}
@@ -765,13 +772,7 @@ static int __init compass_akm8963_init(void)
int result = 0;
int type = ops->type;
result = sensor_register_slave(type, NULL, NULL, compass_get_ops);
result = misc_register(&compass_dev_device);
if (result < 0) {
printk("%s:fail to register misc device %s\n", __func__, compass_dev_device.name);
goto error;
}
error:
return result;
}

15
drivers/input/sensors/compass/ak8975.c
View File

@@ -112,6 +112,7 @@ Defines a read-only address of the fuse ROM of the AK8975.*/
#define AK8975_DEVICE_ID 0x48
static struct i2c_client *this_client;
static struct miscdevice compass_dev_device;
@@ -168,6 +169,12 @@ static int sensor_init(struct i2c_client *client)
{
printk("%s:info=0x%x,it is not %s\n",__func__, info, sensor->ops->name);
return -1;
}
result = misc_register(&compass_dev_device);
if (result < 0) {
printk("%s:fail to register misc device %s\n", __func__, compass_dev_device.name);
result = -1;
}
@@ -647,13 +654,7 @@ static int __init compass_akm8975_init(void)
int result = 0;
int type = ops->type;
result = sensor_register_slave(type, NULL, NULL, compass_get_ops);
result = misc_register(&compass_dev_device);
if (result < 0) {
printk("%s:fail to register misc device %s\n", __func__, compass_dev_device.name);
goto error;
}
error:
return result;
}