From patchwork Sat Nov 21 03:07:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 38954 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 9F91FB6EF4 for ; Sat, 21 Nov 2009 14:17:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754178AbZKUDNh (ORCPT ); Fri, 20 Nov 2009 22:13:37 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754140AbZKUDNh (ORCPT ); Fri, 20 Nov 2009 22:13:37 -0500 Received: from mail-fx0-f221.google.com ([209.85.220.221]:46053 "EHLO mail-fx0-f221.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753766AbZKUDNg (ORCPT ); Fri, 20 Nov 2009 22:13:36 -0500 Received: by fxm21 with SMTP id 21so4330403fxm.21 for ; Fri, 20 Nov 2009 19:13:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=ea5vh/DuzWwM7w4+aCPozBaZFz9NRVDqZR5r9q72ZuY=; b=AnrL2hDEPnFnw/YWcTzrlttWR0J5o5mgrwmu3DOSZBe0OrwbQd6anFFqhCLDCSzR2k arvKKCrmuxDDCm5iLlsQWSy+kc8B+PPbi+maW6C5vclgbxpizXwNCg+QoV4MBRflaAv3 cT52cYdGmyhDq0JZ59/Q92UV8nBzpC8Wl/Y5M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=BrcOfvjQjl6/fsFTYdFwNKbwVcyF9zGDjMPxjXO3JqDjHsZf+ySOW8MTC59TI7NtMq xf/S992Q0GrZWku4dxr3VMa80Ta+ASp32jmKxEXSWeGYqp5S8/BuOpuEad8jpKcB6El3 8ls0XaLmSbESY9pmi3C/0iyL5vZxZ2rwmyeKQ= Received: by 10.103.126.9 with SMTP id d9mr1028613mun.103.1258773221424; Fri, 20 Nov 2009 19:13:41 -0800 (PST) Received: from localhost.localdomain (bohr2.srcc.msu.ru [212.192.244.122]) by mx.google.com with ESMTPS id w5sm8810566mue.52.2009.11.20.19.13.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 20 Nov 2009 19:13:40 -0800 (PST) From: Alexander Beregalov To: davem@davemloft.net Cc: netdev@vger.kernel.org, alohre@gmail.com, Alexander Beregalov Subject: [PATCH] Au1x00: fix crash when trying register_netdev() Date: Sat, 21 Nov 2009 06:07:35 +0300 Message-Id: <1258772855-9141-1-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.5.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Andreas Lohre reported that the driver crashes when trying to register_netdev(), he sugessted to move dev->netdev_ops initialization before calling register_netdev(), it worked for him. Reported-by: Andreas Lohre Signed-off-by: Alexander Beregalov --- David, please send it to stable@ for 2.6.31 drivers/net/au1000_eth.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index ce6f1ac..3f4b430 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c @@ -1088,7 +1088,14 @@ static struct net_device * au1000_probe(int port_num) return NULL; } - if ((err = register_netdev(dev)) != 0) { + dev->base_addr = base; + dev->irq = irq; + dev->netdev_ops = &au1000_netdev_ops; + SET_ETHTOOL_OPS(dev, &au1000_ethtool_ops); + dev->watchdog_timeo = ETH_TX_TIMEOUT; + + err = register_netdev(dev); + if (err != 0) { printk(KERN_ERR "%s: Cannot register net device, error %d\n", DRV_NAME, err); free_netdev(dev); @@ -1209,12 +1216,6 @@ static struct net_device * au1000_probe(int port_num) aup->tx_db_inuse[i] = pDB; } - dev->base_addr = base; - dev->irq = irq; - dev->netdev_ops = &au1000_netdev_ops; - SET_ETHTOOL_OPS(dev, &au1000_ethtool_ops); - dev->watchdog_timeo = ETH_TX_TIMEOUT; - /* * The boot code uses the ethernet controller, so reset it to start * fresh. au1000_init() expects that the device is in reset state.