diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-22 18:15:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-22 18:15:14 -0700 |
| commit | ad9ddd66c6e8a79630a975ff0bb8d45a11abe630 (patch) | |
| tree | bd487aea099fc96a795cb57a8799202fe3b027fa /drivers/i2c/i2c-core.c | |
| parent | cdb7532f7be35c3675b1aed54d10e378014618b6 (diff) | |
| parent | a1ba15832c8f6ac2d5d193a6dbb91bcf7705b732 (diff) | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c-s3c2410: Fix build warning
i2c-tiny-usb: Fix truncated adapter name
i2c: Legacy i2c drivers shouldn't issue uevents
Diffstat (limited to 'drivers/i2c/i2c-core.c')
| -rw-r--r-- | drivers/i2c/i2c-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 64f8e56d300e..435925eba437 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -697,9 +697,10 @@ int i2c_attach_client(struct i2c_client *client) if (client->driver) client->dev.driver = &client->driver->driver; - if (client->driver && !is_newstyle_driver(client->driver)) + if (client->driver && !is_newstyle_driver(client->driver)) { client->dev.release = i2c_client_release; - else + client->dev.uevent_suppress = 1; + } else client->dev.release = i2c_client_dev_release; snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id), |