diff --git a/[refs] b/[refs]
index cc4aebe9a1ef..fdd5379d1cca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19baba4cb6843bbe3dfde87e1e913f6a9cd27da9
+refs/heads/master: f5fb0822957b914ab7022cc4bfe000ec3bc9c82c
diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c
index f7cd05b4f327..e4fe4940fd82 100644
--- a/trunk/drivers/i2c/i2c-core.c
+++ b/trunk/drivers/i2c/i2c-core.c
@@ -1231,7 +1231,7 @@ int i2c_del_adapter(struct i2c_adapter *adap)
 	if (found != adap) {
 		pr_debug("i2c-core: attempting to delete unregistered "
 			 "adapter [%s]\n", adap->name);
-		return -EINVAL;
+		return 0;
 	}
 
 	/* Tell drivers about this removal */