From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYi0L-0000fw-Nw for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:48:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYi0I-0000Yv-L7 for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:48:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYi0I-0000Yn-DA for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:48:02 -0500 From: Kevin Wolf Date: Wed, 14 Nov 2012 19:47:22 +0100 Message-Id: <1352918847-3696-22-git-send-email-kwolf@redhat.com> In-Reply-To: <1352918847-3696-1-git-send-email-kwolf@redhat.com> References: <1352918847-3696-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 21/26] fdc: remove double affectation of FD_MSR_CMDBUSY flag List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Herv=C3=A9 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=C3=A9 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, i= nt direction) /* Set the FIFO state */ fdctrl->data_dir =3D direction; fdctrl->data_pos =3D 0; - fdctrl->msr |=3D FD_MSR_CMDBUSY; + assert(fdctrl->msr & FD_MSR_CMDBUSY); if (fdctrl->fifo[0] & 0x80) fdctrl->data_state |=3D FD_STATE_MULTI; else --=20 1.7.6.5