diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-14 16:23:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-14 16:23:20 -0500 |
| commit | 031f2dcd7075e218e74dd7f942ad015cf82dffab (patch) | |
| tree | d7ee06c0fcfb2e841230e38de704dd0fed60bd7e /drivers/i2c/i2c-dev.c | |
| parent | a98fdcef941e107eeabae622d85a1f476f25a160 (diff) | |
| parent | 5cd6e675f862568ad73c061665ee5080cfd952c5 (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-sibyte: Fix an error path
i2c: Driver IDs are optional
i2c: Spelling fixes
i2c-omap: Fix NULL pointer dereferencing
Diffstat (limited to 'drivers/i2c/i2c-dev.c')
| -rw-r--r-- | drivers/i2c/i2c-dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index c21ae20ae362..df540d5dfaf4 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c | |||
| @@ -184,7 +184,7 @@ static ssize_t i2cdev_write (struct file *file, const char __user *buf, size_t c | |||
| 184 | 184 | ||
| 185 | /* This address checking function differs from the one in i2c-core | 185 | /* This address checking function differs from the one in i2c-core |
| 186 | in that it considers an address with a registered device, but no | 186 | in that it considers an address with a registered device, but no |
| 187 | bounded driver, as NOT busy. */ | 187 | bound driver, as NOT busy. */ |
| 188 | static int i2cdev_check_addr(struct i2c_adapter *adapter, unsigned int addr) | 188 | static int i2cdev_check_addr(struct i2c_adapter *adapter, unsigned int addr) |
| 189 | { | 189 | { |
| 190 | struct list_head *item; | 190 | struct list_head *item; |
