Commit 73061da0 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman

intel_th: Check for NULL instead of ERR_PTR

devm_ioremap() returns NULL on error, it doesn't return an ERR_PTR,
which is what the current code does. This patch corrects these
checks.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1c090575
......@@ -635,8 +635,8 @@ static int intel_th_gth_probe(struct intel_th_device *thdev)
return -ENODEV;
base = devm_ioremap(dev, res->start, resource_size(res));
if (IS_ERR(base))
return PTR_ERR(base);
if (!base)
return -ENOMEM;
gth = devm_kzalloc(dev, sizeof(*gth), GFP_KERNEL);
if (!gth)
......
......@@ -1458,8 +1458,8 @@ static int intel_th_msc_probe(struct intel_th_device *thdev)
return -ENODEV;
base = devm_ioremap(dev, res->start, resource_size(res));
if (IS_ERR(base))
return PTR_ERR(base);
if (!base)
return -ENOMEM;
msc = devm_kzalloc(dev, sizeof(*msc), GFP_KERNEL);
if (!msc)
......
......@@ -207,8 +207,8 @@ static int intel_th_pti_probe(struct intel_th_device *thdev)
return -ENODEV;
base = devm_ioremap(dev, res->start, resource_size(res));
if (IS_ERR(base))
return PTR_ERR(base);
if (!base)
return -ENOMEM;
pti = devm_kzalloc(dev, sizeof(*pti), GFP_KERNEL);
if (!pti)
......
......@@ -194,16 +194,16 @@ static int intel_th_sth_probe(struct intel_th_device *thdev)
return -ENODEV;
base = devm_ioremap(dev, res->start, resource_size(res));
if (IS_ERR(base))
return PTR_ERR(base);
if (!base)
return -ENOMEM;
res = intel_th_device_get_resource(thdev, IORESOURCE_MEM, 1);
if (!res)
return -ENODEV;
channels = devm_ioremap(dev, res->start, resource_size(res));
if (IS_ERR(channels))
return PTR_ERR(channels);
if (!channels)
return -ENOMEM;
sth = devm_kzalloc(dev, sizeof(*sth), GFP_KERNEL);
if (!sth)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment