From owner-svn-src-stable@FreeBSD.ORG  Sat Oct 15 12:33:25 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 34F85106566C;
	Sat, 15 Oct 2011 12:33:25 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 242F48FC15;
	Sat, 15 Oct 2011 12:33:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9FCXP3x013665;
	Sat, 15 Oct 2011 12:33:25 GMT
	(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9FCXOc0013663;
	Sat, 15 Oct 2011 12:33:25 GMT
	(envelope-from brueffer@svn.freebsd.org)
Message-Id: <201110151233.p9FCXOc0013663@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Sat, 15 Oct 2011 12:33:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226387 - stable/9/sys/dev/bwn
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Oct 2011 12:33:25 -0000

Author: brueffer
Date: Sat Oct 15 12:33:24 2011
New Revision: 226387
URL: http://svn.freebsd.org/changeset/base/226387

Log:
  MFC: r226146
  
  Remove dead code, "error" doesn't change between this check and the
  previous one.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/dev/bwn/if_bwn.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/dev/bwn/if_bwn.c
==============================================================================
--- stable/9/sys/dev/bwn/if_bwn.c	Sat Oct 15 12:10:34 2011	(r226386)
+++ stable/9/sys/dev/bwn/if_bwn.c	Sat Oct 15 12:33:24 2011	(r226387)
@@ -3213,8 +3213,6 @@ bwn_core_init(struct bwn_mac *mac)
 		bwn_pio_init(mac);
 	else
 		bwn_dma_init(mac);
-	if (error)
-		goto fail1;
 	bwn_wme_init(mac);
 	bwn_spu_setdelay(mac, 1);
 	bwn_bt_enable(mac);
@@ -3230,8 +3228,6 @@ bwn_core_init(struct bwn_mac *mac)
 
 	return (error);
 
-fail1:
-	bwn_chip_exit(mac);
 fail0:
 	siba_powerdown(sc->sc_dev);
 	KASSERT(mac->mac_status == BWN_MAC_STATUS_UNINIT,