Merge branch 'origin' into devel
Conflicts: sound/soc/pxa/pxa2xx-i2s.c
This commit is contained in:
@@ -841,7 +841,7 @@ int i2c_attach_client(struct i2c_client *client)
|
||||
|
||||
if (client->driver && !is_newstyle_driver(client->driver)) {
|
||||
client->dev.release = i2c_client_release;
|
||||
client->dev.uevent_suppress = 1;
|
||||
dev_set_uevent_suppress(&client->dev, 1);
|
||||
} else
|
||||
client->dev.release = i2c_client_dev_release;
|
||||
|
||||
|
Reference in New Issue
Block a user