Commit 9d8e18b1 authored by Piotr Chmura's avatar Piotr Chmura Committed by Mauro Carvalho Chehab
Browse files

[media] staging: as102: Enable compilation 



Fix compilation errors in the USB driver by replacing usb_buffer_free(),
usb_buffer_alloc() with usb_free_coherent() and usb_alloc_coherent().
Add entries for the driver in parent Makefile and Kconfig.

[snjw23@gmail.com: minor edit to changelog]
Cc: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarPiotr Chmura <chmooreck@poczta.onet.pl>
Signed-off-by: default avatarSylwester Nawrocki <snjw23@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3b4544a3

drivers/staging/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -144,4 +144,6 @@ source "drivers/staging/mei/Kconfig" 


source "drivers/staging/nvec/Kconfig"



source "drivers/staging/media/as102/Kconfig"



endif # STAGING

drivers/staging/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/

drivers/staging/media/as102/as102_usb_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE