Date: Sat, 15 Oct 2011 12:33:24 +0000 (UTC) From: Christian Brueffer <brueffer@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r226387 - stable/9/sys/dev/bwn Message-ID: <201110151233.p9FCXOc0013663@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110151233.p9FCXOc0013663>