UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] v4l: ti-vpe: fix return value check in vpe_probe() 

In case of error, the function devm_kzalloc() and devm_ioremap()
returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return
value check should be replaced with NULL test.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Reviewed-by: Archit Taneja <archit@ti.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Wei Yongjun 2013-10-30 00:15:13 -03:00 committed by Mauro Carvalho Chehab
parent 6676cafe6b
commit b68231a1b5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/ti-vpe/vpe.c
View File

@ -1942,8 +1942,8 @@ static int vpe_probe(struct platform_device *pdev)
int ret, irq, func;
dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
if (IS_ERR(dev))
return PTR_ERR(dev);
if (!dev)
return -ENOMEM;
spin_lock_init(&dev->lock);
@ -1962,8 +1962,8 @@ static int vpe_probe(struct platform_device *pdev)
* registers based on the sub block base addresses
*/
dev->base = devm_ioremap(&pdev->dev, res->start, SZ_32K);
if (IS_ERR(dev->base)) {
ret = PTR_ERR(dev->base);
if (!dev->base) {
ret = -ENOMEM;
goto v4l2_dev_unreg;
}