From patchwork Wed Jan 7 18:23:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nable X-Patchwork-Id: 426500 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 4BBE4140119 for ; Thu, 8 Jan 2015 16:18:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 577804B624; Thu, 8 Jan 2015 06:17:56 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id li1SJdmNzAfw; Thu, 8 Jan 2015 06:17:56 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0F86B4B61C; Thu, 8 Jan 2015 06:17:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B7A924B600 for ; Wed, 7 Jan 2015 19:23:24 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Blx9cvnT-zlx for ; Wed, 7 Jan 2015 19:23:24 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com [209.85.215.42]) by theia.denx.de (Postfix) with ESMTPS id 825334B5FD for ; Wed, 7 Jan 2015 19:23:21 +0100 (CET) Received: by mail-la0-f42.google.com with SMTP id gd6so5126791lab.1 for ; Wed, 07 Jan 2015 10:23:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=JV4tWgpUMYFfGmADJnlBvYAp3JmBLh0BKxmCMxKj+Uk=; b=oGubZK0TiHF9UDmj5qNdzfKckq04C+Sr8G0451AKcHkJ7UDAK7UVjf6kgImSvSsG8U k+8fuOXOKSEeWWqwQq9B1Qh6ha+OOZufN9WcCUbjJpluIDtvNgU0KFwaj/qu73Jwn2x3 vmdKrKWH1kKzdTt6TYJiAhoxZ4AVxNFFV/GXmWVvrUyCfRh9a0/i68DpP4dSAvY95oRo c5bqRY2E7/W14i9fL+g0vYRhYHrmGr0UIc6BJU4WKrK6S3Xi9YN6FBOpyGLxJKO1wGUk KhUPuVREl0UR/Ib6Tk6amnKtQ/mg1tX0NjblcaXnXQv1f4X0aJwIxNKKcFSxBUJWm8XA g2NA== X-Received: by 10.112.8.69 with SMTP id p5mr6956635lba.97.1420654999999; Wed, 07 Jan 2015 10:23:19 -0800 (PST) Received: from localhost.localdomain ([93.175.16.64]) by mx.google.com with ESMTPSA id ki4sm610006lac.1.2015.01.07.10.23.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jan 2015 10:23:19 -0800 (PST) From: Nable X-Google-Original-From: Nable To: u-boot@lists.denx.de Date: Wed, 7 Jan 2015 21:23:52 +0300 Message-Id: <1420655032-14097-1-git-send-email-Nable.MainInbox@googlemail.com> X-Mailer: git-send-email 2.1.4 X-Mailman-Approved-At: Thu, 08 Jan 2015 06:17:48 +0100 Cc: Marek Vasut , =?UTF-8?q?=C5=81ukasz=20Da=C5=82ek?= Subject: [U-Boot] [PATCH] usb: gadget: pxa25x_udc: fix use-before-initialized bug X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Fix use-before-initialized bug in pxa25x_udc driver. Function usb_gadget_register_driver calls udc_disable, and udc_disable calls pullup_off that uses dev->mach->udc_command. But dev->mach is initialized in usb_gadget_register_driver after calling udc_disable. This patch fixes the order of initialization. Signed-off-by: Nable --- drivers/usb/gadget/pxa25x_udc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 8945c5b..d4460b2 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c @@ -1950,11 +1950,11 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) dev->watchdog.period = 5000 * CONFIG_SYS_HZ / 1000000; /* 5 ms */ dev->watchdog.function = udc_watchdog; + dev->mach = &mach_info; + udc_disable(dev); udc_reinit(dev); - dev->mach = &mach_info; - dev->gadget.name = "pxa2xx_udc"; retval = driver->bind(&dev->gadget); if (retval) {