From patchwork Fri Jul 8 09:50:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 103804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E07C51007D1 for ; Fri, 8 Jul 2011 20:24:26 +1000 (EST) Received: from localhost ([::1]:50805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qf8EQ-0005En-96 for incoming@patchwork.ozlabs.org; Fri, 08 Jul 2011 06:24:22 -0400 Received: from eggs.gnu.org ([140.186.70.92]:59532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qf7iY-0005XI-5f for qemu-devel@nongnu.org; Fri, 08 Jul 2011 05:51:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qf7iU-0004PE-FK for qemu-devel@nongnu.org; Fri, 08 Jul 2011 05:51:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32768) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qf7iU-0004Oy-09 for qemu-devel@nongnu.org; Fri, 08 Jul 2011 05:51:22 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p689pLMB019506 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 8 Jul 2011 05:51:21 -0400 Received: from rincewind.home.kraxel.org (vpn1-4-123.ams2.redhat.com [10.36.4.123]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p689pIUb000989; Fri, 8 Jul 2011 05:51:19 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 49E3441A0B; Fri, 8 Jul 2011 11:51:14 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 8 Jul 2011 11:50:59 +0200 Message-Id: <1310118673-26196-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1310118673-26196-1-git-send-email-kraxel@redhat.com> References: <1310118673-26196-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Hans de Goede , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 09/23] usb-ehci: cleanup port reset handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Hans de Goede Doing a usb_attach when dev is NULL will just result in the port detach op getting called even though nothing was connected in the first place. Signed-off-by: Hans de Goede Signed-off-by: Gerd Hoffmann --- hw/usb-ehci.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c index ce1a432..d85e0a9 100644 --- a/hw/usb-ehci.c +++ b/hw/usb-ehci.c @@ -863,14 +863,9 @@ static void handle_port_status_write(EHCIState *s, int port, uint32_t val) if (!(val & PORTSC_PRESET) &&(*portsc & PORTSC_PRESET)) { trace_usb_ehci_port_reset(port, 0); - usb_attach(&s->ports[port], dev); - - // TODO how to handle reset of ports with no device if (dev) { + usb_attach(&s->ports[port], dev); usb_send_msg(dev, USB_MSG_RESET); - } - - if (s->ports[port].dev) { *portsc &= ~PORTSC_CSC; }