1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index cf71c33ac2b2..c5ad918e36e3 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -1060,6 +1060,14 @@ static int i2c_hid_probe(struct i2c_client *client,
         pm_runtime_enable(&client->dev);
         device_enable_async_suspend(&client->dev);
 
+        /* Make sure there is something at this address */
+        ret = i2c_smbus_read_byte(client);
+        if (ret < 0) {
+                dev_dbg(&client->dev, "nothing at this address: %d\n", ret);
+                ret = -ENXIO;
+                goto err_pm;
+        }
+
         ret = i2c_hid_fetch_hid_descriptor(ihid);
         if (ret < 0)
                 goto err_pm;