From owner-svn-src-stable@FreeBSD.ORG  Thu Feb 28 18:59:01 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 25D04A87;
 Thu, 28 Feb 2013 18:59:01 +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 18C61C3D;
 Thu, 28 Feb 2013 18:59:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1SIx0jp008648;
 Thu, 28 Feb 2013 18:59:00 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1SIx0fo008647;
 Thu, 28 Feb 2013 18:59:00 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201302281859.r1SIx0fo008647@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 28 Feb 2013 18:59:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r247490 - stable/8/sys/dev/puc
X-SVN-Group: stable-8
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: Thu, 28 Feb 2013 18:59:01 -0000

Author: jhb
Date: Thu Feb 28 18:59:00 2013
New Revision: 247490
URL: http://svnweb.freebsd.org/changeset/base/247490

Log:
  MFC 245471:
  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.

Modified:
  stable/8/sys/dev/puc/puc.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/puc/   (props changed)

Modified: stable/8/sys/dev/puc/puc.c
==============================================================================
--- stable/8/sys/dev/puc/puc.c	Thu Feb 28 18:58:37 2013	(r247489)
+++ stable/8/sys/dev/puc/puc.c	Thu Feb 28 18:59:00 2013	(r247490)
@@ -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);