[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 <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/media/go7007/Makefile b/drivers/staging/media/go7007/Makefile
index 5bed78b..f9c8e0f 100644 (file)
--- 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 72e5175..6453ec0 100644 (file)
--- a/drivers/staging/media/go7007/s2250-loader.c
+++ b/drivers/staging/media/go7007/s2250-loader.c
@@ -19,7 +19,8 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
-#include <dvb-usb.h>
+#include <linux/firmware.h>
+#include <cypress_firmware.h>
 
 #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");