Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 583a4e88 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

[PATCH] fix pm_message_t stuff in -mm tree 



This should bits from -mm tree that are affected by pm_message_t
conversion.  [I'm not 100% sure I got all of them, but I certainly got all
the errors on make allyesconfig build, and most of warnings, too.  I'll go
through the buildlog tommorow and fix any remaining bits].

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ca078bae

drivers/net/wireless/hostap/hostap_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static int prism2_pci_suspend(struct pci_dev *pdev, pm_message_t state) 
	prism2_suspend(dev);

	pci_save_state(pdev);

	pci_disable_device(pdev);

	pci_set_power_state(pdev, 3);

	pci_set_power_state(pdev, PCI_D3hot);



	return 0;

}

drivers/net/wireless/ipw2200.c

+2 −2
Original line number Diff line number Diff line
@@ -7225,7 +7225,7 @@ static void ipw_pci_remove(struct pci_dev *pdev) 




#ifdef CONFIG_PM

static int ipw_pci_suspend(struct pci_dev *pdev, u32 state)

static int ipw_pci_suspend(struct pci_dev *pdev, pm_message_t state)

{

	struct ipw_priv *priv = pci_get_drvdata(pdev);

	struct net_device *dev = priv->net_dev;
@@ -7240,7 +7240,7 @@ static int ipw_pci_suspend(struct pci_dev *pdev, u32 state) 


	pci_save_state(pdev);

	pci_disable_device(pdev);

	pci_set_power_state(pdev, state);

	pci_set_power_state(pdev, pci_choose_state(pdev, state));



	return 0;

}