Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
media
/
platform
/
coda
/
coda-common.c
diff --git
a/kernel/drivers/media/platform/coda/coda-common.c
b/kernel/drivers/media/platform/coda/coda-common.c
index
15516a6
..
323aad3
100644
(file)
--- a/
kernel/drivers/media/platform/coda/coda-common.c
+++ b/
kernel/drivers/media/platform/coda/coda-common.c
@@
-2119,14
+2119,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);
INIT_LIST_HEAD(&dev->instances);
spin_lock_init(&dev->irqlock);
INIT_LIST_HEAD(&dev->instances);