Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933564Ab0D3Rqd (ORCPT ); Fri, 30 Apr 2010 13:46:33 -0400 Received: from buzzloop.caiaq.de ([212.112.241.133]:39780 "EHLO buzzloop.caiaq.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757724Ab0D3RqQ (ORCPT ); Fri, 30 Apr 2010 13:46:16 -0400 Date: Fri, 30 Apr 2010 07:59:14 +0200 From: Daniel Mack To: Stephen Rothwell Cc: Greg KH , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Takashi Iwai Subject: Re: linux-next: manual merge of the usb tree with the sound tree Message-ID: <20100430055914.GA30801@buzzloop.caiaq.de> References: <20100430155134.a35db59a.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100430155134.a35db59a.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2879 Lines: 75 On Fri, Apr 30, 2010 at 03:51:34PM +1000, Stephen Rothwell wrote: > Today's linux-next merge of the usb tree got a conflict in > sound/usb/usbaudio.c between commit > e5779998bf8b70e48a6cc208c8b61b33bd6117ea ("ALSA: usb-audio: refactor > code") from the sound tree and commit > 3cc96f50329227fbf34de2459491901b6ee1c98c ("USB: rename usb_buffer_alloc() > and usb_buffer_free() users") from the usb tree. > > The former moved the relevant code from usbaudio.c to urb.c, so I applied > the changes from the latter to that (see below). Oops, yes. Ironically, these are both my patches. Thanks for fixing this up, Stephen. Daniel > From: Stephen Rothwell > Date: Fri, 30 Apr 2010 14:44:54 +1000 > Subject: [PATCH] sound: fixup for usb_buffer_alloc/free rename > > Signed-off-by: Stephen Rothwell > --- > sound/usb/urb.c | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/sound/usb/urb.c b/sound/usb/urb.c > index 5570a2b..de607d4 100644 > --- a/sound/usb/urb.c > +++ b/sound/usb/urb.c > @@ -101,7 +101,7 @@ static void release_urb_ctx(struct snd_urb_ctx *u) > { > if (u->urb) { > if (u->buffer_size) > - usb_buffer_free(u->subs->dev, u->buffer_size, > + usb_free_coherent(u->subs->dev, u->buffer_size, > u->urb->transfer_buffer, > u->urb->transfer_dma); > usb_free_urb(u->urb); > @@ -154,7 +154,7 @@ void snd_usb_release_substream_urbs(struct snd_usb_substream *subs, int force) > release_urb_ctx(&subs->dataurb[i]); > for (i = 0; i < SYNC_URBS; i++) > release_urb_ctx(&subs->syncurb[i]); > - usb_buffer_free(subs->dev, SYNC_URBS * 4, > + usb_free_coherent(subs->dev, SYNC_URBS * 4, > subs->syncbuf, subs->sync_dma); > subs->syncbuf = NULL; > subs->nurbs = 0; > @@ -308,8 +308,8 @@ int snd_usb_init_substream_urbs(struct snd_usb_substream *subs, > if (!u->urb) > goto out_of_memory; > u->urb->transfer_buffer = > - usb_buffer_alloc(subs->dev, u->buffer_size, GFP_KERNEL, > - &u->urb->transfer_dma); > + usb_alloc_coherent(subs->dev, u->buffer_size, > + GFP_KERNEL, &u->urb->transfer_dma); > if (!u->urb->transfer_buffer) > goto out_of_memory; > u->urb->pipe = subs->datapipe; > @@ -321,7 +321,7 @@ int snd_usb_init_substream_urbs(struct snd_usb_substream *subs, > > if (subs->syncpipe) { > /* allocate and initialize sync urbs */ > - subs->syncbuf = usb_buffer_alloc(subs->dev, SYNC_URBS * 4, > + subs->syncbuf = usb_alloc_coherent(subs->dev, SYNC_URBS * 4, > GFP_KERNEL, &subs->sync_dma); > if (!subs->syncbuf) > goto out_of_memory; > -- > 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/