diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 22:59:27 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 22:59:27 +0300 |
| commit | fa7b906e7fef53b6c9eb3ecb8164b0a69e9e1a68 (patch) | |
| tree | 8fa745403e1506c211d00ce787d71ee647d65ea2 /drivers/i2c/busses/i2c-amd756-s4882.c | |
| parent | 08249903ea233a79b4167395f2fb79ccd1fb5f94 (diff) | |
| parent | 66c7acf61dc6b27954bb9ceb8617d447ac03734a (diff) | |
| download | linux-fa7b906e7fef53b6c9eb3ecb8164b0a69e9e1a68.tar.xz | |
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: Use snprintf to set adapter names
Input: apanel - convert to new i2c binding
i2c: Drop I2C_CLASS_CAM_DIGITAL
i2c: Drop I2C_CLASS_CAM_ANALOG and I2C_CLASS_SOUND
i2c: Drop I2C_CLASS_ALL
i2c: Get rid of remaining bus_id access
i2c: Replace bus_id with dev_name(), dev_set_name()
Diffstat (limited to 'drivers/i2c/busses/i2c-amd756-s4882.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-amd756-s4882.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c index 8ba2bcf727d3..378fcb5d5783 100644 --- a/drivers/i2c/busses/i2c-amd756-s4882.c +++ b/drivers/i2c/busses/i2c-amd756-s4882.c @@ -197,8 +197,8 @@ static int __init amd756_s4882_init(void) for (i = 1; i < 5; i++) { s4882_algo[i] = *(amd756_smbus.algo); s4882_adapter[i] = amd756_smbus; - sprintf(s4882_adapter[i].name, - "SMBus 8111 adapter (CPU%d)", i-1); + snprintf(s4882_adapter[i].name, sizeof(s4882_adapter[i].name), + "SMBus 8111 adapter (CPU%d)", i-1); s4882_adapter[i].algo = s4882_algo+i; s4882_adapter[i].dev.parent = amd756_smbus.dev.parent; } |