diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /drivers/message/fusion/mptbase.c | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'drivers/message/fusion/mptbase.c')
| -rw-r--r-- | drivers/message/fusion/mptbase.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 8b623278ccd2..ffbe6f4720e1 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
| @@ -1363,19 +1363,7 @@ mpt_suspend(struct pci_dev *pdev, pm_message_t state) | |||
| 1363 | u32 device_state; | 1363 | u32 device_state; |
| 1364 | MPT_ADAPTER *ioc = pci_get_drvdata(pdev); | 1364 | MPT_ADAPTER *ioc = pci_get_drvdata(pdev); |
| 1365 | 1365 | ||
| 1366 | switch(state) | 1366 | device_state=pci_choose_state(pdev, state); |
| 1367 | { | ||
| 1368 | case 1: /* S1 */ | ||
| 1369 | device_state=1; /* D1 */; | ||
| 1370 | break; | ||
| 1371 | case 3: /* S3 */ | ||
| 1372 | case 4: /* S4 */ | ||
| 1373 | device_state=3; /* D3 */; | ||
| 1374 | break; | ||
| 1375 | default: | ||
| 1376 | return -EAGAIN /*FIXME*/; | ||
| 1377 | break; | ||
| 1378 | } | ||
| 1379 | 1367 | ||
| 1380 | printk(MYIOC_s_INFO_FMT | 1368 | printk(MYIOC_s_INFO_FMT |
| 1381 | "pci-suspend: pdev=0x%p, slot=%s, Entering operating state [D%d]\n", | 1369 | "pci-suspend: pdev=0x%p, slot=%s, Entering operating state [D%d]\n", |