Merge tag 'regulator-fix-v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / misc / pvpanic.c

diff --git a/drivers/misc/pvpanic.c b/drivers/misc/pvpanic.c
index 951b37d..41cab29 100644 (file)
--- a/drivers/misc/pvpanic.c
+++ b/drivers/misc/pvpanic.c
@@ -55,12 +55,23 @@ static int pvpanic_mmio_probe(struct platform_device *pdev)
        struct resource *res;
 
        res = platform_get_mem_or_io(pdev, 0);
-       if (res && resource_type(res) == IORESOURCE_IO)
+       if (!res)
+               return -EINVAL;
+
+       switch (resource_type(res)) {
+       case IORESOURCE_IO:
                base = devm_ioport_map(dev, res->start, resource_size(res));
-       else
+               if (!base)
+                       return -ENOMEM;
+               break;
+       case IORESOURCE_MEM:
                base = devm_ioremap_resource(dev, res);
-       if (IS_ERR(base))
-               return PTR_ERR(base);
+               if (IS_ERR(base))
+                       return PTR_ERR(base);
+               break;
+       default:
+               return -EINVAL;
+       }
 
        atomic_notifier_chain_register(&panic_notifier_list,
                                       &pvpanic_panic_nb);