Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1248806
| From | Alexander Shishkin <alexander.shishkin@linux.intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 2/2] intel_th: Check for NULL instead of ERR_PTR |
| Date | 2015-10-16 16:20 +0200 |
| Message-ID | <qke1t-jy-37@gated-at.bofh.it> (permalink) |
| References | <qkdRM-8a-27@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Dan Carpenter <dan.carpenter@oracle.com> 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> --- drivers/hwtracing/intel_th/gth.c | 4 ++-- drivers/hwtracing/intel_th/msu.c | 4 ++-- drivers/hwtracing/intel_th/pti.c | 4 ++-- drivers/hwtracing/intel_th/sth.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/hwtracing/intel_th/gth.c b/drivers/hwtracing/intel_th/gth.c index 673d272ee4..2dc5378ccd 100644 --- a/drivers/hwtracing/intel_th/gth.c +++ b/drivers/hwtracing/intel_th/gth.c @@ -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) diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c index 80a12384ed..70ca27e456 100644 --- a/drivers/hwtracing/intel_th/msu.c +++ b/drivers/hwtracing/intel_th/msu.c @@ -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) diff --git a/drivers/hwtracing/intel_th/pti.c b/drivers/hwtracing/intel_th/pti.c index 1e3bbc8982..57cbfdcc7e 100644 --- a/drivers/hwtracing/intel_th/pti.c +++ b/drivers/hwtracing/intel_th/pti.c @@ -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) diff --git a/drivers/hwtracing/intel_th/sth.c b/drivers/hwtracing/intel_th/sth.c index e488fccbfd..56101c33e1 100644 --- a/drivers/hwtracing/intel_th/sth.c +++ b/drivers/hwtracing/intel_th/sth.c @@ -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) -- 2.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[PATCH 0/2] stm/intel_th: Misc fixes Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2015-10-16 16:10 +0200 [PATCH 1/2] stm class: Select configfs Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2015-10-16 16:20 +0200 [PATCH 2/2] intel_th: Check for NULL instead of ERR_PTR Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2015-10-16 16:20 +0200
csiph-web