1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/base/isa.c b/drivers/base/isa.c
index cd6ccdcf9df0..372d10af2600 100644
--- a/drivers/base/isa.c
+++ b/drivers/base/isa.c
@@ -39,7 +39,7 @@ static int isa_bus_probe(struct device *dev)
 {
         struct isa_driver *isa_driver = dev->platform_data;
 
-        if (isa_driver->probe)
+        if (isa_driver && isa_driver->probe)
                 return isa_driver->probe(dev, to_isa_dev(dev)->id);
 
         return 0;
@@ -49,7 +49,7 @@ static int isa_bus_remove(struct device *dev)
 {
         struct isa_driver *isa_driver = dev->platform_data;
 
-        if (isa_driver->remove)
+        if (isa_driver && isa_driver->remove)
                 return isa_driver->remove(dev, to_isa_dev(dev)->id);
 
         return 0;
@@ -59,7 +59,7 @@ static void isa_bus_shutdown(struct device *dev)
 {
         struct isa_driver *isa_driver = dev->platform_data;
 
-        if (isa_driver->shutdown)
+        if (isa_driver && isa_driver->shutdown)
                 isa_driver->shutdown(dev, to_isa_dev(dev)->id);
 }
 
@@ -67,7 +67,7 @@ static int isa_bus_suspend(struct device *dev, pm_message_t state)
 {
         struct isa_driver *isa_driver = dev->platform_data;
 
-        if (isa_driver->suspend)
+        if (isa_driver && isa_driver->suspend)
                 return isa_driver->suspend(dev, to_isa_dev(dev)->id, state);
 
         return 0;
@@ -77,7 +77,7 @@ static int isa_bus_resume(struct device *dev)
 {
         struct isa_driver *isa_driver = dev->platform_data;
 
-        if (isa_driver->resume)
+        if (isa_driver && isa_driver->resume)
                 return isa_driver->resume(dev, to_isa_dev(dev)->id);
 
         return 0;