openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Hans Verkuil 2013-03-09 09:35:07 -03:00 committed by Mauro Carvalho Chehab
parent 5e4105467b
commit c046981f1a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/media/go7007/Makefile
View File

@ -11,8 +11,8 @@ s2250-y := s2250-board.o
#obj-$(CONFIG_VIDEO_SAA7134) += saa7134-go7007.o #obj-$(CONFIG_VIDEO_SAA7134) += saa7134-go7007.o
#ccflags-$(CONFIG_VIDEO_SAA7134:m=y) += -Idrivers/media/video/saa7134 -DSAA7134_MPEG_GO7007=3 #ccflags-$(CONFIG_VIDEO_SAA7134:m=y) += -Idrivers/media/video/saa7134 -DSAA7134_MPEG_GO7007=3
# S2250 needs cypress ezusb loader from 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 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-frontends
ccflags-y += -Idrivers/media/dvb-core ccflags-y += -Idrivers/media/dvb-core

7
drivers/staging/media/go7007/s2250-loader.c
View File

@ -19,7 +19,8 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/usb.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_LOADER_FIRMWARE "s2250_loader.fw"
#define S2250_FIRMWARE "s2250.fw" #define S2250_FIRMWARE "s2250.fw"
@ -104,7 +105,7 @@ static int s2250loader_probe(struct usb_interface *interface,
S2250_LOADER_FIRMWARE); S2250_LOADER_FIRMWARE);
goto failed2; goto failed2;
} }
ret = usb_cypress_load_firmware(usbdev, fw, CYPRESS_FX2); ret = usbv2_cypress_load_firmware(usbdev, fw, CYPRESS_FX2);
release_firmware(fw); release_firmware(fw);
if (0 != ret) { if (0 != ret) {
dev_err(&interface->dev, "loader download failed\n"); dev_err(&interface->dev, "loader download failed\n");
@ -117,7 +118,7 @@ static int s2250loader_probe(struct usb_interface *interface,
S2250_FIRMWARE); S2250_FIRMWARE);
goto failed2; goto failed2;
} }
ret = usb_cypress_load_firmware(usbdev, fw, CYPRESS_FX2); ret = usbv2_cypress_load_firmware(usbdev, fw, CYPRESS_FX2);
release_firmware(fw); release_firmware(fw);
if (0 != ret) { if (0 != ret) {
dev_err(&interface->dev, "firmware_s2250 download failed\n"); dev_err(&interface->dev, "firmware_s2250 download failed\n");