git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
ide
/
pci
/
sc1200.c
diff --git
a/drivers/ide/pci/sc1200.c
b/drivers/ide/pci/sc1200.c
index
3bc3bf1
..
24e21b2
100644
(file)
--- 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)
{
ide_hwif_t *hwif = NULL;
{
ide_hwif_t *hwif = NULL;
- printk("SC1200: suspend(%u)\n", state);
+ printk("SC1200: suspend(%u)\n", state
.event
);
- if (state
== 0
) {
+ if (state
.event == PM_EVENT_ON
) {
// we only save state when going from full power to less
//
// we only save state when going from full power to less
//
@@
-386,8
+386,8
@@
static int sc1200_suspend (struct pci_dev *dev, pm_message_t state)
/* You don't need to iterate over disks -- sysfs should have done that for you already */
pci_disable_device(dev);
/* You don't need to iterate over disks -- sysfs should have done that for you already */
pci_disable_device(dev);
- pci_set_power_state(dev,
state
);
- dev->current_state = state;
+ pci_set_power_state(dev,
pci_choose_state(dev, state)
);
+ dev->current_state = state
.event
;
return 0;
}
return 0;
}
@@
-396,8
+396,8
@@
static int sc1200_resume (struct pci_dev *dev)
ide_hwif_t *hwif = NULL;
printk("SC1200: resume\n");
ide_hwif_t *hwif = NULL;
printk("SC1200: resume\n");
- pci_set_power_state(dev,
0);
// bring chip back from sleep state
- dev->current_state =
0
;
+ pci_set_power_state(dev,
PCI_D0);
// bring chip back from sleep state
+ dev->current_state =
PM_EVENT_ON
;
pci_enable_device(dev);
//
// loop over all interfaces that are part of this pci device:
pci_enable_device(dev);
//
// loop over all interfaces that are part of this pci device:
@@
-459,7
+459,7
@@
printk("%s: SC1200: resume\n", hwif->name);
* This gets invoked by the IDE driver once for each channel,
* and performs channel-specific pre-initialization before drive probing.
*/
* This gets invoked by the IDE driver once for each channel,
* and performs channel-specific pre-initialization before drive probing.
*/
-static void __init init_hwif_sc1200 (ide_hwif_t *hwif)
+static void __
dev
init init_hwif_sc1200 (ide_hwif_t *hwif)
{
if (hwif->mate)
hwif->serialized = hwif->mate->serialized = 1;
{
if (hwif->mate)
hwif->serialized = hwif->mate->serialized = 1;