From owner-svn-src-user@FreeBSD.ORG  Fri Nov 12 20:01:53 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 988AD1065670;
	Fri, 12 Nov 2010 20:01:53 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 871238FC13;
	Fri, 12 Nov 2010 20:01:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oACK1rfi021859;
	Fri, 12 Nov 2010 20:01:53 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACK1rwu021857;
	Fri, 12 Nov 2010 20:01:53 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <201011122001.oACK1rwu021857@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Fri, 12 Nov 2010 20:01:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215196 - user/weongyo/usb/sys/dev/usb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Nov 2010 20:01:53 -0000

Author: weongyo
Date: Fri Nov 12 20:01:53 2010
New Revision: 215196
URL: http://svn.freebsd.org/changeset/base/215196

Log:
  No reason to avoid using M_WAITOK at usbpf_attach().
  
  Pointed by:	hps

Modified:
  user/weongyo/usb/sys/dev/usb/usb_pf.c

Modified: user/weongyo/usb/sys/dev/usb/usb_pf.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_pf.c	Fri Nov 12 19:43:12 2010	(r215195)
+++ user/weongyo/usb/sys/dev/usb/usb_pf.c	Fri Nov 12 20:01:53 2010	(r215196)
@@ -1317,10 +1317,7 @@ usbpf_attach(struct usb_bus *ubus, struc
 {
 	struct usbpf_if *uif;
 
-	uif = malloc(sizeof(*uif), M_USBPF, M_NOWAIT | M_ZERO);
-	if (uif == NULL)
-		panic("usbpf_attach");
-
+	uif = malloc(sizeof(*uif), M_USBPF, M_WAITOK | M_ZERO);
 	LIST_INIT(&uif->uif_dlist);
 	uif->uif_ubus = ubus;
 	mtx_init(&uif->uif_mtx, "usbpf interface lock", NULL, MTX_DEF);