|
@@ -2178,14 +2178,12 @@ static int coda_probe(struct platform_device *pdev)
|
|
|
|
|
|
|
|
pdev_id = of_id ? of_id->data : platform_get_device_id(pdev);
|
|
pdev_id = of_id ? of_id->data : platform_get_device_id(pdev);
|
|
|
|
|
|
|
|
- if (of_id) {
|
|
|
|
|
|
|
+ if (of_id)
|
|
|
dev->devtype = of_id->data;
|
|
dev->devtype = of_id->data;
|
|
|
- } else if (pdev_id) {
|
|
|
|
|
|
|
+ else if (pdev_id)
|
|
|
dev->devtype = &coda_devdata[pdev_id->driver_data];
|
|
dev->devtype = &coda_devdata[pdev_id->driver_data];
|
|
|
- } else {
|
|
|
|
|
- ret = -EINVAL;
|
|
|
|
|
- goto err_v4l2_register;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ else
|
|
|
|
|
+ return -EINVAL;
|
|
|
|
|
|
|
|
spin_lock_init(&dev->irqlock);
|
|
spin_lock_init(&dev->irqlock);
|
|
|
INIT_LIST_HEAD(&dev->instances);
|
|
INIT_LIST_HEAD(&dev->instances);
|