diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
| commit | 84860bf0644d7c45afe7ddbd30731c3e3c371fae (patch) | |
| tree | d6c4b98a9c3fd9981e7fcc5d7729c9e01e327767 /drivers/i2c/i2c-core.c | |
| parent | 8caf89157d64f1eedba37113afb4b303b2b3e301 (diff) | |
| parent | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/i2c/i2c-core.c')
| -rw-r--r-- | drivers/i2c/i2c-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index dda472e5e8be..45aa0e54e297 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
| @@ -48,7 +48,7 @@ static int i2c_bus_suspend(struct device * dev, pm_message_t state) | |||
| 48 | int rc = 0; | 48 | int rc = 0; |
| 49 | 49 | ||
| 50 | if (dev->driver && dev->driver->suspend) | 50 | if (dev->driver && dev->driver->suspend) |
| 51 | rc = dev->driver->suspend(dev,state,0); | 51 | rc = dev->driver->suspend(dev, state); |
| 52 | return rc; | 52 | return rc; |
| 53 | } | 53 | } |
| 54 | 54 | ||
| @@ -57,7 +57,7 @@ static int i2c_bus_resume(struct device * dev) | |||
| 57 | int rc = 0; | 57 | int rc = 0; |
| 58 | 58 | ||
| 59 | if (dev->driver && dev->driver->resume) | 59 | if (dev->driver && dev->driver->resume) |
| 60 | rc = dev->driver->resume(dev,0); | 60 | rc = dev->driver->resume(dev); |
| 61 | return rc; | 61 | return rc; |
| 62 | } | 62 | } |
| 63 | 63 | ||