From c046981f1aa0e1e1345e6ec43f6bea611e575351 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 9 Mar 2013 09:35:07 -0300 Subject: [PATCH] [media] s2250-loader: use usbv2_cypress_load_firmware The v2 of this function doesn't do DMA to objects on the stack like its predecessor does. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/go7007/Makefile | 4 ++-- drivers/staging/media/go7007/s2250-loader.c | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/staging/media/go7007/Makefile b/drivers/staging/media/go7007/Makefile index 5bed78b2c524..f9c8e0f34c5d 100644 --- a/drivers/staging/media/go7007/Makefile +++ b/drivers/staging/media/go7007/Makefile @@ -11,8 +11,8 @@ s2250-y := s2250-board.o #obj-$(CONFIG_VIDEO_SAA7134) += saa7134-go7007.o #ccflags-$(CONFIG_VIDEO_SAA7134:m=y) += -Idrivers/media/video/saa7134 -DSAA7134_MPEG_GO7007=3 -# S2250 needs cypress ezusb loader from dvb-usb -ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/usb/dvb-usb +# S2250 needs cypress ezusb loader from dvb-usb-v2 +ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/usb/dvb-usb-v2 ccflags-y += -Idrivers/media/dvb-frontends ccflags-y += -Idrivers/media/dvb-core diff --git a/drivers/staging/media/go7007/s2250-loader.c b/drivers/staging/media/go7007/s2250-loader.c index 72e5175fe7e3..6453ec0fb93b 100644 --- a/drivers/staging/media/go7007/s2250-loader.c +++ b/drivers/staging/media/go7007/s2250-loader.c @@ -19,7 +19,8 @@ #include #include #include -#include +#include +#include #define S2250_LOADER_FIRMWARE "s2250_loader.fw" #define S2250_FIRMWARE "s2250.fw" @@ -104,7 +105,7 @@ static int s2250loader_probe(struct usb_interface *interface, S2250_LOADER_FIRMWARE); goto failed2; } - ret = usb_cypress_load_firmware(usbdev, fw, CYPRESS_FX2); + ret = usbv2_cypress_load_firmware(usbdev, fw, CYPRESS_FX2); release_firmware(fw); if (0 != ret) { dev_err(&interface->dev, "loader download failed\n"); @@ -117,7 +118,7 @@ static int s2250loader_probe(struct usb_interface *interface, S2250_FIRMWARE); goto failed2; } - ret = usb_cypress_load_firmware(usbdev, fw, CYPRESS_FX2); + ret = usbv2_cypress_load_firmware(usbdev, fw, CYPRESS_FX2); release_firmware(fw); if (0 != ret) { dev_err(&interface->dev, "firmware_s2250 download failed\n");