diff options
| author | wdenk <wdenk> | 2004-05-12 22:54:36 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-05-12 22:54:36 +0000 |
| commit | 02b11f8e096fde3fc891190c413014a63cdc37b3 (patch) | |
| tree | a54ae384e4818c20966cd8710bc9d2fa27b3faf9 /drivers | |
| parent | 6c1362cf637ccaa89806edf70f000009672c509e (diff) | |
| download | u-boot-imx-02b11f8e096fde3fc891190c413014a63cdc37b3.zip u-boot-imx-02b11f8e096fde3fc891190c413014a63cdc37b3.tar.gz u-boot-imx-02b11f8e096fde3fc891190c413014a63cdc37b3.tar.bz2 | |
Patch by Klaus Heydeck, 12 May 2004:
Using external watchdog for KUP4 boards in mpc8xx/cpu.c;
load_sernum_ethaddr() for KUP4 boards in lib_ppc/board.c;
various changes to KUP4 board specific files
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/sl811_usb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sl811_usb.c b/drivers/sl811_usb.c index 37ed982..b0cdf0b 100644 --- a/drivers/sl811_usb.c +++ b/drivers/sl811_usb.c @@ -248,7 +248,7 @@ static int sl811_send_packet(struct usb_device *dev, unsigned long pipe, __u8 *b ctrl |= SL811_USB_CTRL_TOGGLE_1; if (need_preamble) ctrl |= SL811_USB_CTRL_PREAMBLE; - + sl811_write(SL811_INTRSTS, 0xff); while (err < 3) { @@ -386,9 +386,9 @@ int submit_control_msg(struct usb_device *dev, unsigned long pipe, void *buffer, sl811_write(SL811_PIDEP_A, PIDEP(!dir_in ? USB_PID_IN : USB_PID_OUT, ep)); usb_settoggle(dev, ep, !usb_pipeout(pipe), 1); - if (sl811_send_packet(dev, - !dir_in ? usb_rcvctrlpipe(dev, ep) : - usb_sndctrlpipe(dev, ep), + if (sl811_send_packet(dev, + !dir_in ? usb_rcvctrlpipe(dev, ep) : + usb_sndctrlpipe(dev, ep), 0, 0) < 0) { PDEBUG(0, "status phase failed!\n"); dev->status = -1; |