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

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

[PATCH] fix pm_message_t vs. u32 in alsa 



I thought I'm done with fixing u32 vs.  pm_message_t ...  unfortunately that
turned out not to be the case as Russel King pointed out.  This fixes last few
bits in alsa.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e5378ca8

sound/core/init.c

+2 −2
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ struct snd_generic_device { 


#define SND_GENERIC_NAME	"snd_generic_pm"



static int snd_generic_suspend(struct device *dev, u32 state, u32 level);

static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level);

static int snd_generic_resume(struct device *dev, u32 level);



static struct device_driver snd_generic_driver = {
@@ -800,7 +800,7 @@ static void snd_generic_device_unregister(struct snd_generic_device *dev) 
}



/* suspend/resume callbacks for snd_generic platform device */

static int snd_generic_suspend(struct device *dev, u32 state, u32 level)

static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level)

{

	snd_card_t *card;

sound/pci/atiixp_modem.c

+2 −2
Original line number Diff line number Diff line
@@ -1121,7 +1121,7 @@ static int snd_atiixp_suspend(snd_card_t *card, pm_message_t state) 
	snd_atiixp_aclink_down(chip);

	snd_atiixp_chip_stop(chip);



	pci_set_power_state(chip->pci, 3);

	pci_set_power_state(chip->pci, PCI_D3hot);

	pci_disable_device(chip->pci);

	return 0;

}
@@ -1132,7 +1132,7 @@ static int snd_atiixp_resume(snd_card_t *card) 
	int i;



	pci_enable_device(chip->pci);

	pci_set_power_state(chip->pci, 0);

	pci_set_power_state(chip->pci, PCI_D0);

	pci_set_master(chip->pci);



	snd_atiixp_aclink_reset(chip);