diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-12 12:14:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-12 12:14:19 -0700 |
| commit | 0d38eddab9ce6de3a9d6d583043dfa97b6bc0d3b (patch) | |
| tree | 59f1f4d3712ce3658f7540704d64c8d8ad6d4635 /drivers/usb/misc/emi62.c | |
| parent | 1a2acc9e9214699a99389e323e6686e9e0e2ca67 (diff) | |
| parent | df3fccb14ad02c5fabe095a104a0323c223f2833 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
[PATCH] USB: fix omninet driver bug
[PATCH] USB: add ark3116 usb to serial driver
[PATCH] usbserial: Fixes leak in serial_open() error path.
[PATCH] usbserial: Fixes use-after-free in serial_open().
[PATCH] USB: Emagic USB firmware loading fixes
[PATCH] USB: add an IBM USB keyboard to the HID_QUIRK_NOGET blacklist
[PATCH] USB: Add Sieraa Wireless 580 evdo card to airprime.c
[PATCH] USB: ftdi_sio: add device id for ACT Solutions HomePro ZWave interface
[PATCH] USB: ftdi_sio: Add support for HCG HF Dual ISO RFID Reader
[PATCH] USB: ub oops in block_uevent
[PATCH] USB: usbcore: don't check the device's power source
[PATCH] USB: fix OHCI PM regression
[PATCH] USB: pegasus fixes (logstorm, suspend)
[PATCH] USBATM: fix modinfo output
[PATCH] USBATM: change the default speedtouch iso altsetting
[PATCH] USB: fix bug in ohci-hcd.c ohci_restart()
Diffstat (limited to 'drivers/usb/misc/emi62.c')
| -rw-r--r-- | drivers/usb/misc/emi62.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c index 52fea2e08db..fe351371f27 100644 --- a/drivers/usb/misc/emi62.c +++ b/drivers/usb/misc/emi62.c @@ -15,6 +15,7 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/usb.h> +#include <linux/delay.h> #define MAX_INTEL_HEX_RECORD_LENGTH 16 typedef struct _INTEL_HEX_RECORD @@ -123,6 +124,7 @@ static int emi62_load_firmware (struct usb_device *dev) /* De-assert reset (let the CPU run) */ err = emi62_set_reset(dev,0); + msleep(250); /* let device settle */ /* 2. We upload the FPGA firmware into the EMI * Note: collect up to 1023 (yes!) bytes and send them with @@ -166,6 +168,7 @@ static int emi62_load_firmware (struct usb_device *dev) err("%s - error loading firmware: error = %d", __FUNCTION__, err); goto wraperr; } + msleep(250); /* let device settle */ /* 4. We put the part of the firmware that lies in the external RAM into the EZ-USB */ @@ -228,6 +231,7 @@ static int emi62_load_firmware (struct usb_device *dev) err("%s - error loading firmware: error = %d", __FUNCTION__, err); goto wraperr; } + msleep(250); /* let device settle */ kfree(buf); |