github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

camera: fix access memory illegal which have been free , when sensor probe error

Browse Source
This commit is contained in:
ddl 2011-01-29 12:22:24 +08:00
parent cb544aec0a
commit 9505d021e0
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/media/video/ov5640.c
View File

@ -3465,16 +3465,17 @@ static int sensor_probe(struct i2c_client *client,
icd->ops = NULL;
i2c_set_clientdata(client, NULL);
kfree(sensor);
sensor = NULL;
} else {
#if CONFIG_SENSOR_Focus
sensor->sensor_wq = create_workqueue(SENSOR_NAME_STRING( wq));
if (sensor->sensor_wq == NULL)
SENSOR_TR("%s workqueue create fail!", SENSOR_NAME_STRING( wq));
mutex_init(&sensor->wq_lock);
sensor->sensor_wk.state = sensor_work_ready;
#endif
}
#if CONFIG_SENSOR_Focus
sensor->sensor_wq = create_workqueue(SENSOR_NAME_STRING( wq));
if (sensor->sensor_wq == NULL)
SENSOR_TR("%s workqueue create fail!", SENSOR_NAME_STRING( wq));
mutex_init(&sensor->wq_lock);
sensor->sensor_wk.state = sensor_work_ready;
#endif
SENSOR_DG("\n%s..%s..%d ret = %x \n",__FUNCTION__,__FILE__,__LINE__,ret);
return ret;
}
@ -3495,7 +3496,7 @@ static int sensor_remove(struct i2c_client *client)
i2c_set_clientdata(client, NULL);
client->driver = NULL;
kfree(sensor);
sensor = NULL;
return 0;
}

21
drivers/media/video/ov5642.c
View File

@ -5437,20 +5437,21 @@ static int sensor_probe(struct i2c_client *client,
#endif
ret = sensor_video_probe(icd, client);
if (ret) {
if (ret < 0) {
icd->ops = NULL;
i2c_set_clientdata(client, NULL);
kfree(sensor);
sensor = NULL;
} else {
#if CONFIG_SENSOR_Focus
sensor->sensor_wq = create_workqueue(SENSOR_NAME_STRING( wq));
if (sensor->sensor_wq == NULL)
SENSOR_TR("%s workqueue create fail!", SENSOR_NAME_STRING( wq));
mutex_init(&sensor->wq_lock);
sensor->sensor_wk.state = sensor_work_ready;
#endif
}
#if CONFIG_SENSOR_Focus
sensor->sensor_wq = create_workqueue(SENSOR_NAME_STRING( wq));
if (sensor->sensor_wq == NULL)
SENSOR_TR("%s workqueue create fail!", SENSOR_NAME_STRING( wq));
mutex_init(&sensor->wq_lock);
sensor->sensor_wk.state = sensor_work_ready;
#endif
SENSOR_DG("\n%s..%s..%d ret = %x \n",__FUNCTION__,__FILE__,__LINE__,ret);
return ret;
}
@ -5471,7 +5472,7 @@ static int sensor_remove(struct i2c_client *client)
i2c_set_clientdata(client, NULL);
client->driver = NULL;
kfree(sensor);
sensor = NULL;
return 0;
}