diff options
| author | Dan Carpenter | 2015-10-16 16:09:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-17 08:25:48 +0200 |
| commit | 73061da07d28ac6724bcd9ce4b51cf51a8b6b40e (patch) | |
| tree | bda6bd37fb26f21fa47d6e49de3483e124952ed4 /drivers/hwtracing/intel_th/sth.c | |
| parent | stm class: Select configfs (diff) | |
| download | kernel-qcow2-linux-73061da07d28ac6724bcd9ce4b51cf51a8b6b40e.tar.gz kernel-qcow2-linux-73061da07d28ac6724bcd9ce4b51cf51a8b6b40e.tar.xz kernel-qcow2-linux-73061da07d28ac6724bcd9ce4b51cf51a8b6b40e.zip | |
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/sth.c')
| -rw-r--r-- | drivers/hwtracing/intel_th/sth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hwtracing/intel_th/sth.c b/drivers/hwtracing/intel_th/sth.c index e488fccbfdec..56101c33e10f 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) |