From 65c98f9dfd4ef5be3e13a9f2037d84c0dc7e8bce Mon Sep 17 00:00:00 2001 From: matthieu castet Date: Fri, 9 Oct 2009 22:12:25 +0200 Subject: [PATCH] --- yaml --- r: 170927 b: refs/heads/master c: 40b93ad6e97a1d412c4b86f4717fee9b4bc830e1 h: refs/heads/master i: 170925: dce7505b635e855bd53a9f4c3a8ab097171e6797 170923: e5f256f170bac1818911f96c59633181b2fcbe27 170919: d7ea2583667c717d121ce3d197a3887ecc92adb3 170911: 3653ad8a623e53d13d26e05fece11b1b7287a436 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/airo.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4a411b986734..5d7a7a5631cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c32bec78e1af751a279ec1614eadd36aab532e56 +refs/heads/master: 40b93ad6e97a1d412c4b86f4717fee9b4bc830e1 diff --git a/trunk/drivers/net/wireless/airo.c b/trunk/drivers/net/wireless/airo.c index 7116a1aa20ce..e265ba14054b 100644 --- a/trunk/drivers/net/wireless/airo.c +++ b/trunk/drivers/net/wireless/airo.c @@ -5660,7 +5660,8 @@ static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state) pci_enable_wake(pdev, pci_choose_state(pdev, state), 1); pci_save_state(pdev); - return pci_set_power_state(pdev, pci_choose_state(pdev, state)); + pci_set_power_state(pdev, pci_choose_state(pdev, state)); + return 0; } static int airo_pci_resume(struct pci_dev *pdev)