X-Git-Url: http://git.maemo.org/git/?p=qemu;a=blobdiff_plain;f=hw%2Fac97.c;fp=hw%2Fac97.c;h=288f42813c5f058556d0fe99ed566093f5a64157;hp=d9ef141744edf78d6a51a91d6a68910714b14cdc;hb=759b334a9739814df2883aa4c41b1c0f5670e90a;hpb=7e2198fc87e878b8ce5df965477e21713ebf7834 diff --git a/hw/ac97.c b/hw/ac97.c index d9ef141..288f428 100644 --- a/hw/ac97.c +++ b/hw/ac97.c @@ -1308,7 +1308,7 @@ static void ac97_on_reset (void *opaque) mixer_reset (s); } -int ac97_init (PCIBus *bus, AudioState *audio) +int ac97_init (PCIBus *bus) { PCIAC97LinkState *d; AC97LinkState *s; @@ -1319,11 +1319,6 @@ int ac97_init (PCIBus *bus, AudioState *audio) return -1; } - if (!audio) { - AUD_log ("ac97", "No audio state\n"); - return -1; - } - d = (PCIAC97LinkState *) pci_register_device (bus, "AC97", sizeof (PCIAC97LinkState), -1, NULL, NULL); @@ -1374,8 +1369,8 @@ int ac97_init (PCIBus *bus, AudioState *audio) pci_register_io_region (&d->dev, 0, 256 * 4, PCI_ADDRESS_SPACE_IO, ac97_map); pci_register_io_region (&d->dev, 1, 64 * 4, PCI_ADDRESS_SPACE_IO, ac97_map); register_savevm ("ac97", 0, 2, ac97_save, ac97_load, s); - qemu_register_reset (ac97_on_reset, s); - AUD_register_card (audio, "ac97", &s->card); + qemu_register_reset (ac97_on_reset, 0, s); + AUD_register_card ("ac97", &s->card); ac97_on_reset (s); return 0; }