From owner-svn-src-head@FreeBSD.ORG Wed Feb 4 22:16:28 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D4E61065670; Wed, 4 Feb 2009 22:16:28 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7AF498FC0A; Wed, 4 Feb 2009 22:16:28 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n14MGS4G096492; Wed, 4 Feb 2009 22:16:28 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n14MGSK6096491; Wed, 4 Feb 2009 22:16:28 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200902042216.n14MGSK6096491@svn.freebsd.org> From: Nathan Whitehorn Date: Wed, 4 Feb 2009 22:16:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188131 - head/sys/dev/bm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2009 22:16:29 -0000 Author: nwhitehorn Date: Wed Feb 4 22:16:27 2009 New Revision: 188131 URL: http://svn.freebsd.org/changeset/base/188131 Log: Fix bm_shutdown() KOBJ method to correspond to return int, as it should. Found by: Andriy Gapon Modified: head/sys/dev/bm/if_bm.c Modified: head/sys/dev/bm/if_bm.c ============================================================================== --- head/sys/dev/bm/if_bm.c Wed Feb 4 22:04:06 2009 (r188130) +++ head/sys/dev/bm/if_bm.c Wed Feb 4 22:16:27 2009 (r188131) @@ -81,7 +81,7 @@ MODULE_DEPEND(bm, miibus, 1, 1, 1); static int bm_probe (device_t); static int bm_attach (device_t); static int bm_detach (device_t); -static void bm_shutdown (device_t); +static int bm_shutdown (device_t); static void bm_start (struct ifnet *); static void bm_start_locked (struct ifnet *); @@ -654,7 +654,7 @@ bm_detach(device_t dev) return (0); } -static void +static int bm_shutdown(device_t dev) { struct bm_softc *sc; @@ -664,6 +664,8 @@ bm_shutdown(device_t dev) BM_LOCK(sc); bm_stop(sc); BM_UNLOCK(sc); + + return (0); } static void