From owner-p4-projects@FreeBSD.ORG  Mon Mar  1 09:38:53 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 266F6106567B; Mon,  1 Mar 2010 09:38:53 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DEE791065677
	for <perforce@FreeBSD.org>; Mon,  1 Mar 2010 09:38:52 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CC05D8FC0C
	for <perforce@FreeBSD.org>; Mon,  1 Mar 2010 09:38:52 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o219cqNN016122
	for <perforce@FreeBSD.org>; Mon, 1 Mar 2010 09:38:52 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o219cquU016120
	for perforce@freebsd.org; Mon, 1 Mar 2010 09:38:52 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 1 Mar 2010 09:38:52 GMT
Message-Id: <201003010938.o219cquU016120@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 175242 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Mar 2010 09:38:53 -0000

http://p4web.freebsd.org/chv.cgi?CH=175242

Change 175242 by hselasky@hselasky_laptop001 on 2010/03/01 09:38:51

	
	Fix for panic when inserting USB enabled PCCARD.
		- reviewed by John Baldwin 2009-11-19

Affected files ...

.. //depot/projects/usb/src/sys/dev/pccard/pccard.c#7 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/pccard/pccard.c#7 (text+ko) ====

@@ -1258,7 +1258,10 @@
 pccard_intr(void *arg)
 {
 	struct pccard_function *pf = (struct pccard_function*) arg;
-	
+
+	if (pf->intr_handler == NULL)
+		return;			/* can happen during PCCARD insertion */
+
 	pf->intr_handler(pf->intr_handler_arg);	
 }