From 1aa8825ec94cf7ae6ca0b4f90869753cfbad3eb0 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Mon, 6 Jan 2025 04:08:41 -0700
Subject: [PATCH] hw/audio/ac97: Remove bad merge conflict resolution

---
 hw/audio/ac97.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
index 4b70f78b97..a2d2685fcc 100644
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -1300,10 +1300,6 @@ static void ac97_realize (PCIDevice *dev, Error **errp)
     AC97DeviceState *s = AC97_DEVICE(dev);
     uint8_t *c = s->dev.config;
 
-    if (!AUD_register_card ("ac97", &s->card, errp)) {
-        return;
-    }
-
     /* TODO: no need to override */
     c[PCI_COMMAND] = 0x00;      /* pcicmd pci command rw, ro */
     c[PCI_COMMAND + 1] = 0x00;