redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Dan Carpenter 2015-10-16 17:09:13 +03:00 committed by Greg Kroah-Hartman
parent 1c090575b0
commit 73061da07d
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hwtracing/intel_th/gth.c
View File

@ -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)

4
drivers/hwtracing/intel_th/msu.c
View File

@ -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)

4
drivers/hwtracing/intel_th/pti.c
View File

@ -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)

8
drivers/hwtracing/intel_th/sth.c
View File

@ -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)