linux-next: manual merge of the usb tree with the v4l-dvb tree
in [Kernel]
|
Prev: ad7877: keep dma rx buffers in seperate cache lines
Next: linux-next: manual merge of the staging-next tree with the pcmcia tree
From: Stephen Rothwell on 12 May 2010 02:00 Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/media/video/gspca/gspca.c between commit 659a02869f4a8be95df9efa76af02e53e400555f ("V4L/DVB: gspca - main: Convert wMaxPacketSize from little endian 16 to cpu") from the v4l-dvb tree and commit 42b4658241d4c16c838daf9d63c0029cd7269fe0 ("USB: rename usb_buffer_alloc() and usb_buffer_free() users") from the usb tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc drivers/media/video/gspca/gspca.c index efe6159,00713f8..0000000 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@@ -213,7 -213,7 +213,7 @@@ static int alloc_and_submit_int_urb(str goto error; } - buffer = usb_buffer_alloc(dev, buffer_len, - buffer = usb_alloc_coherent(dev, ep->wMaxPacketSize, ++ buffer = usb_alloc_coherent(dev, buffer_len, GFP_KERNEL, &urb->transfer_dma); if (!buffer) { ret = -ENOMEM; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 12 May 2010 16:00
On Wed, May 12, 2010 at 03:57:50PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/media/video/gspca/gspca.c between commit > 659a02869f4a8be95df9efa76af02e53e400555f ("V4L/DVB: gspca - main: Convert > wMaxPacketSize from little endian 16 to cpu") from the v4l-dvb tree and > commit 42b4658241d4c16c838daf9d63c0029cd7269fe0 ("USB: rename > usb_buffer_alloc() and usb_buffer_free() users") from the usb tree. > > I fixed it up (see below) and can carry the fix as necessary. The fix looks great to me, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |