From patchwork Mon Apr 30 08:51:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 155814 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BD3E0B6F6E for ; Mon, 30 Apr 2012 18:55:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755626Ab2D3Ivg (ORCPT ); Mon, 30 Apr 2012 04:51:36 -0400 Received: from mail-pz0-f51.google.com ([209.85.210.51]:40398 "EHLO mail-pz0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755595Ab2D3Ivf (ORCPT ); Mon, 30 Apr 2012 04:51:35 -0400 Received: by dadz8 with SMTP id z8so3808165dad.10 for ; Mon, 30 Apr 2012 01:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=+cqyhlB5l8wubwiD8rAXofsaWhFNSMi8t+tAQHViG5U=; b=Mfk3tXtTlj8VJ4kXk81NpgJy4A9rWoXCmEFVWnUmdeZmsniT2qq0MgPzTESfbMUkFK xWj0OsmwY/9QEFCH7oTIed4VxP0vIFKuOfG3+5kdlRyRvKmTuSmc1BevoToJpj1D5RDc R/1m60y9SNb+muPQ8JHPJw8+bkc3xzk0z/J8XmKbFWhzYknDrqcphmFe28zZ9DqsioVQ d1I0QpICabGehPY87GERhp/PcAzbXcHx+Q4YwpIIZ9jpY7NMJkvE9VEsLEz+gVdDyOfb oFPHPPKMmqd8fr02DFAp5RUVhOH0co6rHXwSaLHm4ZbLUalH0jUMRvWf2XncZMwIQao7 irpA== Received: by 10.68.231.72 with SMTP id te8mr7823870pbc.99.1335775894669; Mon, 30 Apr 2012 01:51:34 -0700 (PDT) Received: from localhost ([183.37.192.221]) by mx.google.com with ESMTPS id pn10sm13873491pbb.22.2012.04.30.01.51.31 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 Apr 2012 01:51:34 -0700 (PDT) From: Ming Lei To: "David S. Miller" , Greg Kroah-Hartman Cc: netdev@vger.kernel.org, linux-usb@vger.kernel.org, Ming Lei Subject: [PATCH 2/3] usbnet: fix failure handling in usbnet_probe Date: Mon, 30 Apr 2012 16:51:03 +0800 Message-Id: <1335775864-4873-3-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1335775864-4873-1-git-send-email-tom.leiming@gmail.com> References: <1335775864-4873-1-git-send-email-tom.leiming@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If register_netdev returns failure, the dev->interrupt and its transfer buffer should be released, so just fix it. Signed-off-by: Ming Lei --- drivers/net/usb/usbnet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 5b38a3a..80b837c 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1445,7 +1445,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) status = register_netdev (net); if (status) - goto out3; + goto out4; netif_info(dev, probe, dev->net, "register '%s' at usb-%s-%s, %s, %pM\n", udev->dev.driver->name, @@ -1463,6 +1463,8 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) return 0; +out4: + usb_free_urb(dev->interrupt); out3: if (info->unbind) info->unbind (dev, udev);