Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 321748
b: refs/heads/master
c: 1e1ccc3
h: refs/heads/master
v: v3
  • Loading branch information
Tim Gardner authored and Greg Kroah-Hartman committed Aug 16, 2012
1 parent cf70d14 commit fff3612
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a1d95cfc07d637e024027101a691dad5b0eef27a
refs/heads/master: 1e1ccc3ad6ebe720e14dd9787f6b5cebaf46f573
4 changes: 3 additions & 1 deletion trunk/drivers/staging/comedi/drivers/usbdux.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ sampling rate. If you sample two channels you get 4kHz and so on.
#define BULK_TIMEOUT 1000

/* constants for "firmware" upload and download */
#define FIRMWARE "usbdux_firmware.bin"
#define USBDUXSUB_FIRMWARE 0xA0
#define VENDOR_DIR_IN 0xC0
#define VENDOR_DIR_OUT 0x40
Expand Down Expand Up @@ -2791,7 +2792,7 @@ static int usbdux_usb_probe(struct usb_interface *uinterf,

ret = request_firmware_nowait(THIS_MODULE,
FW_ACTION_HOTPLUG,
"usbdux_firmware.bin",
FIRMWARE,
&udev->dev,
GFP_KERNEL,
usbduxsub + index,
Expand Down Expand Up @@ -2850,3 +2851,4 @@ module_comedi_usb_driver(usbdux_driver, usbdux_usb_driver);
MODULE_AUTHOR("Bernd Porr, BerndPorr@f2s.com");
MODULE_DESCRIPTION("Stirling/ITL USB-DUX -- Bernd.Porr@f2s.com");
MODULE_LICENSE("GPL");
MODULE_FIRMWARE(FIRMWARE);

0 comments on commit fff3612

Please sign in to comment.