1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c
index 44d4c6071c15..c99b22987366 100644
--- a/drivers/i2c/i2c-smbus.c
+++ b/drivers/i2c/i2c-smbus.c
@@ -46,6 +46,7 @@ static int smbus_do_alert(struct device *dev, void *addrp)
 {
         struct i2c_client *client = i2c_verify_client(dev);
         struct alert_data *data = addrp;
+        struct i2c_driver *driver;
 
         if (!client || client->addr != data->addr)
                 return 0;
@@ -54,12 +55,13 @@ static int smbus_do_alert(struct device *dev, void *addrp)
 
         /*
          * Drivers should either disable alerts, or provide at least
-         * a minimal handler.  Lock so client->driver won't change.
+         * a minimal handler.  Lock so the driver won't change.
          */
         device_lock(dev);
-        if (client->driver) {
-                if (client->driver->alert)
-                        client->driver->alert(client, data->flag);
+        if (client->dev.driver) {
+                driver = to_i2c_driver(client->dev.driver);
+                if (driver->alert)
+                        driver->alert(client, data->flag);
                 else
                         dev_warn(&client->dev, "no driver alert()!\n");
         } else