Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[firefly-linux-kernel-4.4.55.git] / drivers / hwtracing / intel_th / pti.c

diff --git a/drivers/hwtracing/intel_th/pti.c b/drivers/hwtracing/intel_th/pti.c
index 1e3bbc89825c862425cafb1219f82327a894efde..57cbfdcc7ef011381143cf534ceb9ed20a3bd030 100644 (file)
--- 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)