i2c: Add pointer dereference protection to i2c_match_id()

Here we're providing dereference protection for i2c_match_id(), which
saves us having to do it each time it's called.  We're also stripping
out the (now) needless checks in i2c_device_match().  This patch paves
the way for other, similar code trimming.

Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Tested-by: Kieran Bingham <kieran@bingham.xyz>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Kieran Bingham <kieran@bingham.xyz>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index b432b64e307a81740b0ce8a292dc9b80a3921a40..86083e5e552029f1020519537e95728d84a8a0aa 100644 (file)
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -679,6 +679,9 @@ static inline int i2c_acpi_install_space_handler(struct i2c_adapter *adapter)
 static const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
                                                const struct i2c_client *client)
 {
+       if (!(id && client))
+               return NULL;
+
        while (id->name[0]) {
                if (strcmp(client->name, id->name) == 0)
                        return id;
@@ -692,8 +695,6 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv)
        struct i2c_client       *client = i2c_verify_client(dev);
        struct i2c_driver       *driver;
 
-       if (!client)
-               return 0;
 
        /* Attempt an OF style match */
        if (of_driver_match_device(dev, drv))
@@ -704,9 +705,10 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv)
                return 1;
 
        driver = to_i2c_driver(drv);
-       /* match on an id table if there is one */
-       if (driver->id_table)
-               return i2c_match_id(driver->id_table, client) != NULL;
+
+       /* Finally an I2C match */
+       if (i2c_match_id(driver->id_table, client))
+               return 1;
 
        return 0;
 }