Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 321747
b: refs/heads/master
c: a1d95cf
h: refs/heads/master
i:
  321745: 941355c
  321743: 45fc7ea
v: v3
  • Loading branch information
Tim Gardner authored and Greg Kroah-Hartman committed Aug 16, 2012
1 parent ee96b5c commit cf70d14
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: 8607dcbefb9e1bcbefe2d77f74809cf31e6a04a1
refs/heads/master: a1d95cfc07d637e024027101a691dad5b0eef27a
4 changes: 3 additions & 1 deletion trunk/drivers/staging/comedi/drivers/usbduxsigma.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Status: testing
#define BULK_TIMEOUT 1000

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

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

0 comments on commit cf70d14

Please sign in to comment.