From owner-svn-src-user@FreeBSD.ORG Mon Sep 20 19:14:45 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 E7C10106566B; Mon, 20 Sep 2010 19:14:45 +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 D773C8FC16; Mon, 20 Sep 2010 19:14:45 +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 o8KJEj1E064068; Mon, 20 Sep 2010 19:14:45 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8KJEjDn064066; Mon, 20 Sep 2010 19:14:45 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201009201914.o8KJEjDn064066@svn.freebsd.org> From: Weongyo Jeong Date: Mon, 20 Sep 2010 19:14:45 +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: r212917 - 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 19:14:46 -0000 Author: weongyo Date: Mon Sep 20 19:14:45 2010 New Revision: 212917 URL: http://svn.freebsd.org/changeset/base/212917 Log: style(9) 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 19:13:00 2010 (r212916) +++ user/weongyo/usb/sys/dev/usb/usb_busdma.c Mon Sep 20 19:14:45 2010 (r212917) @@ -422,9 +422,9 @@ usb_pc_common_mem_cb(void *arg, bus_dma_ pc = arg; uptag = pc->tag_parent; - if (error) { + if (error) goto done; - } + pg = pc->page_start; pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); rem = segs->ds_addr & (USB_PAGE_SIZE - 1); @@ -447,15 +447,13 @@ usb_pc_common_mem_cb(void *arg, bus_dma_ pg++; pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); } - done: mtx_lock(uptag->mtx); uptag->dma_error = (error ? 1 : 0); - if (isload) { + if (isload) (uptag->func) (uptag); - } else { + else cv_broadcast(uptag->cv); - } mtx_unlock(uptag->mtx); }