2 files changed, 21 insertions, 0 deletions

diff --git a/sound/aoa/codecs/tas.c b/sound/aoa/codecs/tas.c
index f0ebc971c686..1dd66ddffcaf 100644
--- a/sound/aoa/codecs/tas.c
+++ b/sound/aoa/codecs/tas.c
@@ -897,6 +897,15 @@ static int tas_create(struct i2c_adapter *adapter,
         client = i2c_new_device(adapter, &info);
         if (!client)
                 return -ENODEV;
+        /*
+         * We know the driver is already loaded, so the device should be
+         * already bound. If not it means binding failed, and then there
+         * is no point in keeping the device instantiated.
+         */
+        if (!client->driver) {
+                i2c_unregister_device(client);
+                return -ENODEV;
+        }
 
         /*
          * Let i2c-core delete that device on driver removal.
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index 835fa19ed461..bb6819aab133 100644
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -59,6 +59,18 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter)
         strlcpy(info.type, "keywest", I2C_NAME_SIZE);
         info.addr = keywest_ctx->addr;
         keywest_ctx->client = i2c_new_device(adapter, &info);
+        if (!keywest_ctx->client)
+                return -ENODEV;
+        /*
+         * We know the driver is already loaded, so the device should be
+         * already bound. If not it means binding failed, and then there
+         * is no point in keeping the device instantiated.
+         */
+        if (!keywest_ctx->client->driver) {
+                i2c_unregister_device(keywest_ctx->client);
+                keywest_ctx->client = NULL;
+                return -ENODEV;
+        }
         
         /*
          * Let i2c-core delete that device on driver removal.