diff options
| author |   Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-10-30 11:15:51 +0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-30 10:17:33 -0700 |
| commit | ed5d6ca0038f274aada1244358ad89b7941bdcbf (patch) | |
| tree | 069f5e82bba2277bec6be78cf92e53a38ce69b39 /drivers/staging | |
| parent | Staging: zram: Fix access of NULL pointer (diff) | |
| download | linux-dev-ed5d6ca0038f274aada1244358ad89b7941bdcbf.tar.xz linux-dev-ed5d6ca0038f274aada1244358ad89b7941bdcbf.zip | |
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>
Diffstat (limited to 'drivers/staging')
| -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, 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) |