diff options
Diffstat (limited to 'drivers/ide/pci/sc1200.c')
-rw-r--r-- | drivers/ide/pci/sc1200.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index 10592cec6c43..24e21b2838c1 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c | |||
@@ -350,9 +350,9 @@ static int sc1200_suspend (struct pci_dev *dev, pm_message_t state) | |||
350 | { | 350 | { |
351 | ide_hwif_t *hwif = NULL; | 351 | ide_hwif_t *hwif = NULL; |
352 | 352 | ||
353 | printk("SC1200: suspend(%u)\n", state); | 353 | printk("SC1200: suspend(%u)\n", state.event); |
354 | 354 | ||
355 | if (state == 0) { | 355 | if (state.event == PM_EVENT_ON) { |
356 | // we only save state when going from full power to less | 356 | // we only save state when going from full power to less |
357 | 357 | ||
358 | // | 358 | // |
@@ -386,8 +386,8 @@ static int sc1200_suspend (struct pci_dev *dev, pm_message_t state) | |||
386 | /* You don't need to iterate over disks -- sysfs should have done that for you already */ | 386 | /* You don't need to iterate over disks -- sysfs should have done that for you already */ |
387 | 387 | ||
388 | pci_disable_device(dev); | 388 | pci_disable_device(dev); |
389 | pci_set_power_state(dev,state); | 389 | pci_set_power_state(dev, pci_choose_state(dev, state)); |
390 | dev->current_state = state; | 390 | dev->current_state = state.event; |
391 | return 0; | 391 | return 0; |
392 | } | 392 | } |
393 | 393 | ||
@@ -396,8 +396,8 @@ static int sc1200_resume (struct pci_dev *dev) | |||
396 | ide_hwif_t *hwif = NULL; | 396 | ide_hwif_t *hwif = NULL; |
397 | 397 | ||
398 | printk("SC1200: resume\n"); | 398 | printk("SC1200: resume\n"); |
399 | pci_set_power_state(dev,0); // bring chip back from sleep state | 399 | pci_set_power_state(dev, PCI_D0); // bring chip back from sleep state |
400 | dev->current_state = 0; | 400 | dev->current_state = PM_EVENT_ON; |
401 | pci_enable_device(dev); | 401 | pci_enable_device(dev); |
402 | // | 402 | // |
403 | // loop over all interfaces that are part of this pci device: | 403 | // loop over all interfaces that are part of this pci device: |