diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-12 13:07:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-12 13:07:12 -0700 |
| commit | 123d43acd2e55cd7db792d17c7e906db42cada42 (patch) | |
| tree | 704c222d21fcc9954742f3e3b05ec8e22fe35c01 /drivers/i2c/busses/i2c-amd756.c | |
| parent | 299601cfc0aabbabf82fca50652b7290cce7eb00 (diff) | |
| parent | 3d706d952cf238a60c5571e33329448b453a2ab9 (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: chips subdirectory is deprecated
i2c: Keep client->driver and client->dev.driver in sync
i2c-amd756: Fix off-by-one
Diffstat (limited to 'drivers/i2c/busses/i2c-amd756.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-amd756.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c index 573abe44084..2fa43183d37 100644 --- a/drivers/i2c/busses/i2c-amd756.c +++ b/drivers/i2c/busses/i2c-amd756.c @@ -335,7 +335,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev, u8 temp; /* driver_data might come from user-space, so check it */ - if (id->driver_data > ARRAY_SIZE(chipname)) + if (id->driver_data >= ARRAY_SIZE(chipname)) return -EINVAL; if (amd756_ioport) { |