From patchwork Wed Aug 4 21:33:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Dreier X-Patchwork-Id: 117147 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o74LXWk4003733 for ; Wed, 4 Aug 2010 21:33:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759116Ab0HDVdc (ORCPT ); Wed, 4 Aug 2010 17:33:32 -0400 Received: from sj-iport-6.cisco.com ([171.71.176.117]:65466 "EHLO sj-iport-6.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759073Ab0HDVdb (ORCPT ); Wed, 4 Aug 2010 17:33:31 -0400 Authentication-Results: sj-iport-6.cisco.com; dkim=neutral (message not signed) header.i=none X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AnEFAOJ5WUyrRN+J/2dsb2JhbACTR4xicapHmzKFOwSEHg X-IronPort-AV: E=Sophos;i="4.55,317,1278288000"; d="scan'208";a="568621150" Received: from sj-core-3.cisco.com ([171.68.223.137]) by sj-iport-6.cisco.com with ESMTP; 04 Aug 2010 21:33:31 +0000 Received: from roland-alpha.cisco.com (roland-alpha.cisco.com [10.33.42.9]) by sj-core-3.cisco.com (8.13.8/8.14.3) with ESMTP id o74LXVTI028361; Wed, 4 Aug 2010 21:33:31 GMT Received: by roland-alpha.cisco.com (Postfix, from userid 33217) id 4CF1720439; Wed, 4 Aug 2010 14:33:31 -0700 (PDT) From: Roland Dreier To: linux-rdma@vger.kernel.org Cc: Faisal Latif , Chien Tung Subject: [PATCH] RDMA/nes: Fix misindented code References: X-Message-Flag: Warning: May contain useful information Date: Wed, 04 Aug 2010 14:33:31 -0700 In-Reply-To: (Roland Dreier's message of "Wed, 04 Aug 2010 14:31:00 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 04 Aug 2010 21:34:07 +0000 (UTC) diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c index d53480e..0c9f0aa 100644 --- a/drivers/infiniband/hw/nes/nes.c +++ b/drivers/infiniband/hw/nes/nes.c @@ -661,23 +661,21 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i nes_notifiers_registered++; /* Initialize network devices */ - if ((netdev = nes_netdev_init(nesdev, mmio_regs)) == NULL) { - goto bail7; - } - - /* Register network device */ - ret = register_netdev(netdev); - if (ret) { - printk(KERN_ERR PFX "Unable to register netdev, ret = %d\n", ret); - nes_netdev_destroy(netdev); - goto bail7; - } + if ((netdev = nes_netdev_init(nesdev, mmio_regs)) == NULL) + goto bail7; - nes_print_macaddr(netdev); + /* Register network device */ + ret = register_netdev(netdev); + if (ret) { + printk(KERN_ERR PFX "Unable to register netdev, ret = %d\n", ret); + nes_netdev_destroy(netdev); + goto bail7; + } - nesdev->netdev_count++; - nesdev->nesadapter->netdev_count++; + nes_print_macaddr(netdev); + nesdev->netdev_count++; + nesdev->nesadapter->netdev_count++; printk(KERN_ERR PFX "%s: NetEffect RNIC driver successfully loaded.\n", pci_name(pcidev));