From owner-svn-src-user@FreeBSD.ORG Mon Sep 20 18:49:29 2010 Return-Path: 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 366A41065672; Mon, 20 Sep 2010 18:49:29 +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 2614A8FC1D; Mon, 20 Sep 2010 18:49:29 +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 o8KInTkM063242; Mon, 20 Sep 2010 18:49:29 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8KInTRP063240; Mon, 20 Sep 2010 18:49:29 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201009201849.o8KInTRP063240@svn.freebsd.org> From: Weongyo Jeong Date: Mon, 20 Sep 2010 18:49:29 +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: r212913 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Sep 2010 18:49:29 -0000 Author: weongyo Date: Mon Sep 20 18:49:28 2010 New Revision: 212913 URL: http://svn.freebsd.org/changeset/base/212913 Log: Don't check `align' value 0 whenever it multiplies alignment value and 2 that it looks it's meaningless. Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.c Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_busdma.c Mon Sep 20 18:41:15 2010 (r212912) +++ user/weongyo/usb/sys/dev/usb/usb_busdma.c Mon Sep 20 18:49:28 2010 (r212913) @@ -490,18 +490,16 @@ usb_pc_alloc_mem(struct usb_page_cache * uptag = pc->tag_parent; + if (align == 0) + goto error; if (align != 1) { /* * The alignment must be greater or equal to the * "size" else the object can be split between two * memory pages and we get a problem! */ - while (align < size) { + while (align < size) align *= 2; - if (align == 0) { - goto error; - } - } #if 1 /* * XXX BUS-DMA workaround - FIXME later: