Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 98492
b: refs/heads/master
c: 3cfdc7f
h: refs/heads/master
v: v3
  • Loading branch information
Guennadi Liakhovetski authored and Mauro Carvalho Chehab committed Jun 26, 2008
1 parent 613b379 commit 0d95e5f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 02da465945ae0a277aadf2bf37965a9e6c28f8c3
refs/heads/master: 3cfdc7f25b3116d57e91427caada74dd69bfbc06
16 changes: 0 additions & 16 deletions trunk/drivers/media/video/soc_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -763,15 +763,6 @@ static struct device_driver ic_drv = {
.owner = THIS_MODULE,
};

/*
* Image capture host - this is a host device, not a bus device, so,
* no bus reference, no probing.
*/
static struct class soc_camera_host_class = {
.owner = THIS_MODULE,
.name = "camera_host",
};

static void dummy_release(struct device *dev)
{
}
Expand Down Expand Up @@ -801,7 +792,6 @@ int soc_camera_host_register(struct soc_camera_host *ici)

/* Number might be equal to the platform device ID */
sprintf(ici->dev.bus_id, "camera_host%d", ici->nr);
ici->dev.class = &soc_camera_host_class;

mutex_lock(&list_lock);
list_for_each_entry(ix, &hosts, list) {
Expand Down Expand Up @@ -1003,22 +993,16 @@ static int __init soc_camera_init(void)
ret = driver_register(&ic_drv);
if (ret)
goto edrvr;
ret = class_register(&soc_camera_host_class);
if (ret)
goto eclr;

return 0;

eclr:
driver_unregister(&ic_drv);
edrvr:
bus_unregister(&soc_camera_bus_type);
return ret;
}

static void __exit soc_camera_exit(void)
{
class_unregister(&soc_camera_host_class);
driver_unregister(&ic_drv);
bus_unregister(&soc_camera_bus_type);
}
Expand Down

0 comments on commit 0d95e5f

Please sign in to comment.