openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] coda: identify platform device earlier 

We'll use this information to decide whether to request the JPEG IRQ later.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Philipp Zabel 2014-10-02 14:08:27 -03:00 committed by Mauro Carvalho Chehab
parent 4de69319f0
commit b2f91ae30e
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/platform/coda/coda-common.c
View File

@ -1896,6 +1896,15 @@ static int coda_probe(struct platform_device *pdev)
if (!dev) if (!dev)
return -ENOMEM; return -ENOMEM;
pdev_id = of_id ? of_id->data : platform_get_device_id(pdev);
if (of_id)
dev->devtype = of_id->data;
else if (pdev_id)
dev->devtype = &coda_devdata[pdev_id->driver_data];
else
return -EINVAL;
spin_lock_init(&dev->irqlock); spin_lock_init(&dev->irqlock);
INIT_LIST_HEAD(&dev->instances); INIT_LIST_HEAD(&dev->instances);
@ -1963,17 +1972,6 @@ static int coda_probe(struct platform_device *pdev)
mutex_init(&dev->dev_mutex); mutex_init(&dev->dev_mutex);
mutex_init(&dev->coda_mutex); mutex_init(&dev->coda_mutex);
pdev_id = of_id ? of_id->data : platform_get_device_id(pdev);
if (of_id) {
dev->devtype = of_id->data;
} else if (pdev_id) {
dev->devtype = &coda_devdata[pdev_id->driver_data];
} else {
v4l2_device_unregister(&dev->v4l2_dev);
return -EINVAL;
}
dev->debugfs_root = debugfs_create_dir("coda", NULL); dev->debugfs_root = debugfs_create_dir("coda", NULL);
if (!dev->debugfs_root) if (!dev->debugfs_root)
dev_warn(&pdev->dev, "failed to create debugfs root\n"); dev_warn(&pdev->dev, "failed to create debugfs root\n");