tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Dan Carpenter and committed by
Greg Kroah-Hartman 73061da0 1c090575

+10 -10
+2 -2
drivers/hwtracing/intel_th/gth.c
··· 635 635 return -ENODEV; 636 636 637 637 base = devm_ioremap(dev, res->start, resource_size(res)); 638 - if (IS_ERR(base)) 639 - return PTR_ERR(base); 638 + if (!base) 639 + return -ENOMEM; 640 640 641 641 gth = devm_kzalloc(dev, sizeof(*gth), GFP_KERNEL); 642 642 if (!gth)
+2 -2
drivers/hwtracing/intel_th/msu.c
··· 1458 1458 return -ENODEV; 1459 1459 1460 1460 base = devm_ioremap(dev, res->start, resource_size(res)); 1461 - if (IS_ERR(base)) 1462 - return PTR_ERR(base); 1461 + if (!base) 1462 + return -ENOMEM; 1463 1463 1464 1464 msc = devm_kzalloc(dev, sizeof(*msc), GFP_KERNEL); 1465 1465 if (!msc)
+2 -2
drivers/hwtracing/intel_th/pti.c
··· 207 207 return -ENODEV; 208 208 209 209 base = devm_ioremap(dev, res->start, resource_size(res)); 210 - if (IS_ERR(base)) 211 - return PTR_ERR(base); 210 + if (!base) 211 + return -ENOMEM; 212 212 213 213 pti = devm_kzalloc(dev, sizeof(*pti), GFP_KERNEL); 214 214 if (!pti)
+4 -4
drivers/hwtracing/intel_th/sth.c
··· 194 194 return -ENODEV; 195 195 196 196 base = devm_ioremap(dev, res->start, resource_size(res)); 197 - if (IS_ERR(base)) 198 - return PTR_ERR(base); 197 + if (!base) 198 + return -ENOMEM; 199 199 200 200 res = intel_th_device_get_resource(thdev, IORESOURCE_MEM, 1); 201 201 if (!res) 202 202 return -ENODEV; 203 203 204 204 channels = devm_ioremap(dev, res->start, resource_size(res)); 205 - if (IS_ERR(channels)) 206 - return PTR_ERR(channels); 205 + if (!channels) 206 + return -ENOMEM; 207 207 208 208 sth = devm_kzalloc(dev, sizeof(*sth), GFP_KERNEL); 209 209 if (!sth)