From: Wei Yongjun Date: Wed, 30 Oct 2013 03:15:51 +0000 (+0800) Subject: staging: drm/imx: fix return value check in ipu_add_subdevice_pdata() X-Git-Tag: MMI-PSA29.97-13-9~13364^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ed5d6ca0038f274aada1244358ad89b7941bdcbf;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging: drm/imx: fix return value check in ipu_add_subdevice_pdata() In case of error, the function platform_device_register_data() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/drivers/staging/imx-drm/ipu-v3/ipu-common.c index 77a0c65a3dbe..7a22ce619ed2 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-common.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-common.c @@ -1006,7 +1006,7 @@ static int ipu_add_subdevice_pdata(struct device *dev, pdev = platform_device_register_data(dev, reg->name, ipu_client_id++, ®->pdata, sizeof(struct ipu_platform_reg)); - return pdev ? 0 : -EINVAL; + return PTR_ERR_OR_ZERO(pdev); } static int ipu_add_client_devices(struct ipu_soc *ipu)