diff options
author | Len Brown <len.brown@intel.com> | 2007-07-25 01:36:31 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-07-25 01:36:31 -0400 |
commit | cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4 (patch) | |
tree | 2c52ac06cce163bf467d259119b824eed96f2eca /drivers/pnp/driver.c | |
parent | 1e1f3f24cdbc53e67acd7b2e37e6cf0cb11bd13c (diff) | |
parent | 50ad147aa09c829cd452fae6ca99396c0b5b0695 (diff) |
Pull d-states into release branch
Conflicts:
drivers/acpi/sleep/main.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/driver.c')
-rw-r--r-- | drivers/pnp/driver.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c index e161423b4300..1432806451cd 100644 --- a/drivers/pnp/driver.c +++ b/drivers/pnp/driver.c | |||
@@ -167,6 +167,8 @@ static int pnp_bus_suspend(struct device *dev, pm_message_t state) | |||
167 | return error; | 167 | return error; |
168 | } | 168 | } |
169 | 169 | ||
170 | if (pnp_dev->protocol && pnp_dev->protocol->suspend) | ||
171 | pnp_dev->protocol->suspend(pnp_dev, state); | ||
170 | return 0; | 172 | return 0; |
171 | } | 173 | } |
172 | 174 | ||
@@ -179,6 +181,9 @@ static int pnp_bus_resume(struct device *dev) | |||
179 | if (!pnp_drv) | 181 | if (!pnp_drv) |
180 | return 0; | 182 | return 0; |
181 | 183 | ||
184 | if (pnp_dev->protocol && pnp_dev->protocol->resume) | ||
185 | pnp_dev->protocol->resume(pnp_dev); | ||
186 | |||
182 | if (!(pnp_drv->flags & PNP_DRIVER_RES_DO_NOT_CHANGE)) { | 187 | if (!(pnp_drv->flags & PNP_DRIVER_RES_DO_NOT_CHANGE)) { |
183 | error = pnp_start_dev(pnp_dev); | 188 | error = pnp_start_dev(pnp_dev); |
184 | if (error) | 189 | if (error) |