diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-10-16 17:09:13 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-16 23:25:48 -0700 |
| commit | 73061da07d28ac6724bcd9ce4b51cf51a8b6b40e (patch) | |
| tree | bda6bd37fb26f21fa47d6e49de3483e124952ed4 /drivers/hwtracing/intel_th/gth.c | |
| parent | 1c090575b013cd1f0070567203498704fa61b2fc (diff) | |
| download | linux-73061da07d28ac6724bcd9ce4b51cf51a8b6b40e.tar.gz linux-73061da07d28ac6724bcd9ce4b51cf51a8b6b40e.tar.xz | |
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>
Diffstat (limited to 'drivers/hwtracing/intel_th/gth.c')
| -rw-r--r-- | drivers/hwtracing/intel_th/gth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwtracing/intel_th/gth.c b/drivers/hwtracing/intel_th/gth.c index 673d272ee400..2dc5378ccd3a 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) |