diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-08 09:05:14 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-08 09:05:14 -0500 |
| commit | 220724ca4ada4e30bcfff326b62822a69c23e181 (patch) | |
| tree | c0bb1bdd3ec41c5945000cf43620725d2e00ffd8 /hw/tosa.c | |
| parent | d8ac46d950451a722fd6b1d5d0768c72bee87d47 (diff) | |
| parent | cfc606da0ddcef1f7228317b9f7dfa6c94c6c64f (diff) | |
| download | focaccia-qemu-220724ca4ada4e30bcfff326b62822a69c23e181.tar.gz focaccia-qemu-220724ca4ada4e30bcfff326b62822a69c23e181.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw/tosa.c')
| -rw-r--r-- | hw/tosa.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/hw/tosa.c b/hw/tosa.c index a7967a286e..7b407f4f64 100644 --- a/hw/tosa.c +++ b/hw/tosa.c @@ -51,17 +51,13 @@ static void tosa_microdrive_attach(PXA2xxState *cpu) { PCMCIACardState *md; - BlockDriverState *bs; DriveInfo *dinfo; dinfo = drive_get(IF_IDE, 0, 0); - if (!dinfo) + if (!dinfo || dinfo->media_cd) return; - bs = dinfo->bdrv; - if (bdrv_is_inserted(bs) && !bdrv_is_removable(bs)) { - md = dscm1xxxx_init(dinfo); - pxa2xx_pcmcia_attach(cpu->pcmcia[0], md); - } + md = dscm1xxxx_init(dinfo); + pxa2xx_pcmcia_attach(cpu->pcmcia[0], md); } static void tosa_out_switch(void *opaque, int line, int level) |