From owner-svn-src-head@FreeBSD.ORG  Tue Jan 15 20:13:26 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 67EC41F7;
 Tue, 15 Jan 2013 20:13:26 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5A64C34F;
 Tue, 15 Jan 2013 20:13:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0FKDQgT025545;
 Tue, 15 Jan 2013 20:13:26 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0FKDQBm025543;
 Tue, 15 Jan 2013 20:13:26 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201301152013.r0FKDQBm025543@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 15 Jan 2013 20:13:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245471 - head/sys/dev/puc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jan 2013 20:13:26 -0000

Author: jhb
Date: Tue Jan 15 20:13:25 2013
New Revision: 245471
URL: http://svnweb.freebsd.org/changeset/base/245471

Log:
  Do not require a filter-only interrupt handler for puc ports that are not
  serial devices (such as printer ports).  This allows ppc devices attached
  to puc to correctly setup an interrupt handler and work.
  
  Tested by:	Andre Albsmeier  Andre.Albsmeier@siemens.com
  MFC after:	1 week

Modified:
  head/sys/dev/puc/puc.c

Modified: head/sys/dev/puc/puc.c
==============================================================================
--- head/sys/dev/puc/puc.c	Tue Jan 15 20:10:49 2013	(r245470)
+++ head/sys/dev/puc/puc.c	Tue Jan 15 20:13:25 2013	(r245471)
@@ -622,7 +622,7 @@ puc_bus_setup_intr(device_t dev, device_
 	if (cookiep == NULL || res != port->p_ires)
 		return (EINVAL);
 	/* We demand that serdev devices use filter_only interrupts. */
-	if (ihand != NULL)
+	if (port->p_type == PUC_TYPE_SERIAL && ihand != NULL)
 		return (ENXIO);
 	if (rman_get_device(port->p_ires) != originator)
 		return (ENXIO);