From patchwork Wed Nov 14 18:47:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [21/26] fdc: remove double affectation of FD_MSR_CMDBUSY flag Date: Wed, 14 Nov 2012 08:47:22 -0000 From: Kevin Wolf X-Patchwork-Id: 198993 Message-Id: <1352918847-3696-22-git-send-email-kwolf@redhat.com> To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Hervé Poussineau FD_MSR_CMDBUSY flag is already set in fdctrl_write_data(), just before calling the command handler (fdctrl_start_transfer() here). Signed-off-by: Hervé Poussineau Signed-off-by: Kevin Wolf --- hw/fdc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index 3a82ed1..a197c48 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1239,7 +1239,7 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int direction) /* Set the FIFO state */ fdctrl->data_dir = direction; fdctrl->data_pos = 0; - fdctrl->msr |= FD_MSR_CMDBUSY; + assert(fdctrl->msr & FD_MSR_CMDBUSY); if (fdctrl->fifo[0] & 0x80) fdctrl->data_state |= FD_STATE_MULTI; else