From: pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 17 Nov 2007 15:32:38 +0000 (+0000)
Subject: sd.c build fix.
X-Git-Tag: release_0_9_1~224
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=257514ddce752fe0b4aeb4b7957bc5661eadbef8;p=thirdparty%2Fqemu.git

sd.c build fix.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3673 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/hw/sd.c b/hw/sd.c
index 5be75858e31..25ae9956b68 100644
--- a/hw/sd.c
+++ b/hw/sd.c
@@ -371,8 +371,8 @@ static void sd_reset(SDState *sd, BlockDriverState *bdrv)
 
     sd->bdrv = bdrv;
 
-    if (s->wp_groups)
-        qemu_free(s->wp_groups);
+    if (sd->wp_groups)
+        qemu_free(sd->wp_groups);
     sd->wp_switch = bdrv_is_read_only(bdrv);
     sd->wp_groups = (int *) qemu_mallocz(sizeof(int) * sect);
     memset(sd->wp_groups, 0, sizeof(int) * sect);
@@ -390,7 +390,7 @@ static void sd_cardchange(void *opaque)
     qemu_set_irq(sd->inserted_cb, bdrv_is_inserted(sd->bdrv));
     if (bdrv_is_inserted(sd->bdrv)) {
         sd_reset(sd, sd->bdrv);
-        qemu_set_irq(s->readonly_cb, sd->wp_switch);
+        qemu_set_irq(sd->readonly_cb, sd->wp_switch);
     }
 }