From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 24 09:32:34 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id ED387EC0;
 Wed, 24 Oct 2012 09:32:34 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id D4E1F8FC0A;
 Wed, 24 Oct 2012 09:32:34 +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 q9O9WY2k085002;
 Wed, 24 Oct 2012 09:32:34 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9O9WYfW085000;
 Wed, 24 Oct 2012 09:32:34 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201210240932.q9O9WYfW085000@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 24 Oct 2012 09:32:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r241989 - stable/9/sys/dev/sound/pci
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 24 Oct 2012 09:32:35 -0000

Author: glebius
Date: Wed Oct 24 09:32:34 2012
New Revision: 241989
URL: http://svn.freebsd.org/changeset/base/241989

Log:
  Merge r237975 from head:
    - Call bus_generic_attach() at end of hdspe_attach().
    - Use own devclass_t in DRIVER_MODULE().
  
    This fixes operation of hdspe(4) when built as loadable module.
  
    Submitted by:	Ruslan Bukin <br bsdpad.com>

Modified:
  stable/9/sys/dev/sound/pci/hdspe.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/sound/pci/hdspe.c
==============================================================================
--- stable/9/sys/dev/sound/pci/hdspe.c	Wed Oct 24 08:00:01 2012	(r241988)
+++ stable/9/sys/dev/sound/pci/hdspe.c	Wed Oct 24 09:32:34 2012	(r241989)
@@ -347,7 +347,7 @@ hdspe_attach(device_t dev)
 
 	hdspe_map_dmabuf(sc);
 
-	return 0;
+	return (bus_generic_attach(dev));
 }
 
 static void
@@ -407,4 +407,6 @@ static driver_t hdspe_driver = {
 	PCM_SOFTC_SIZE,
 };
 
-DRIVER_MODULE(snd_hdspe, pci, hdspe_driver, pcm_devclass, 0, 0);
+static devclass_t hdspe_devclass;
+
+DRIVER_MODULE(snd_hdspe, pci, hdspe_driver, hdspe_devclass, 0, 0);