From 7a0dce87ce83ab86bac0ce3802875f114f9f0983 Mon Sep 17 00:00:00 2001 From: Piotr Chmura Date: Mon, 31 Oct 2011 12:24:52 -0300 Subject: [PATCH] --- yaml --- r: 273609 b: refs/heads/master c: 9d8e18b1e966e43729a08421a29510f49f931b60 h: refs/heads/master i: 273607: 06777f8a9a6143452fa672f0be7ca2840e40f7e4 v: v3 --- [refs] | 2 +- trunk/drivers/staging/Kconfig | 2 ++ trunk/drivers/staging/Makefile | 1 + trunk/drivers/staging/media/as102/as102_usb_drv.c | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f52f9fcf253d..8a71abe0dbe4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b4544a3a48b113d09610f2188954f4276047781 +refs/heads/master: 9d8e18b1e966e43729a08421a29510f49f931b60 diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig index d132c27dfb3f..0e1bc6dccccb 100644 --- a/trunk/drivers/staging/Kconfig +++ b/trunk/drivers/staging/Kconfig @@ -144,4 +144,6 @@ source "drivers/staging/mei/Kconfig" source "drivers/staging/nvec/Kconfig" +source "drivers/staging/media/as102/Kconfig" + endif # STAGING diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile index 936b7c22e18e..51999860b0f6 100644 --- a/trunk/drivers/staging/Makefile +++ b/trunk/drivers/staging/Makefile @@ -63,3 +63,4 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/ obj-$(CONFIG_DRM_PSB) += gma500/ obj-$(CONFIG_INTEL_MEI) += mei/ obj-$(CONFIG_MFD_NVEC) += nvec/ +obj-$(CONFIG_DVB_AS102) += media/as102/ diff --git a/trunk/drivers/staging/media/as102/as102_usb_drv.c b/trunk/drivers/staging/media/as102/as102_usb_drv.c index 3a3dd777f70a..2586d5537498 100644 --- a/trunk/drivers/staging/media/as102/as102_usb_drv.c +++ b/trunk/drivers/staging/media/as102/as102_usb_drv.c @@ -238,7 +238,7 @@ static void as102_free_usb_stream_buffer(struct as102_dev_t *dev) for (i = 0; i < MAX_STREAM_URB; i++) usb_free_urb(dev->stream_urb[i]); - usb_buffer_free(dev->bus_adap.usb_dev, + usb_free_coherent(dev->bus_adap.usb_dev, MAX_STREAM_URB * AS102_USB_BUF_SIZE, dev->stream, dev->dma_addr); @@ -251,7 +251,7 @@ static int as102_alloc_usb_stream_buffer(struct as102_dev_t *dev) ENTER(); - dev->stream = usb_buffer_alloc(dev->bus_adap.usb_dev, + dev->stream = usb_alloc_coherent(dev->bus_adap.usb_dev, MAX_STREAM_URB * AS102_USB_BUF_SIZE, GFP_KERNEL, &dev->dma_addr);