diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-10-29 23:15:51 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-30 13:17:33 -0400 |
commit | ed5d6ca0038f274aada1244358ad89b7941bdcbf (patch) | |
tree | 069f5e82bba2277bec6be78cf92e53a38ce69b39 | |
parent | 46a51c80216cb891f271ad021f59009f34677499 (diff) |
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 <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/imx-drm/ipu-v3/ipu-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
1006 | pdev = platform_device_register_data(dev, reg->name, ipu_client_id++, | 1006 | pdev = platform_device_register_data(dev, reg->name, ipu_client_id++, |
1007 | ®->pdata, sizeof(struct ipu_platform_reg)); | 1007 | ®->pdata, sizeof(struct ipu_platform_reg)); |
1008 | 1008 | ||
1009 | return pdev ? 0 : -EINVAL; | 1009 | return PTR_ERR_OR_ZERO(pdev); |
1010 | } | 1010 | } |
1011 | 1011 | ||
1012 | static int ipu_add_client_devices(struct ipu_soc *ipu) | 1012 | static int ipu_add_client_devices(struct ipu_soc *ipu) |