Commit ea8f9fe6 authored Jan 30, 2009 by Jason Andryuk Committed by Greg Kroah-Hartman Feb 09, 2009

Staging: at76_usb: fix bugs introduced by "Staging: at76_usb: cleanup dma on stack issues"



Tracking down the firmware loading problem led to this commit.

$ git bisect bad
0d1d1424 is first bad commit
commit 0d1d1424
Author: Oliver Neukum <oliver@neukum.org>
Date:   Thu Dec 18 13:16:40 2008 +0100

    Staging: at76_usb: cleanup dma on stack issues

    - no DMA on stack
    - cleanup unclear endianness issue

    Signed-off-by: Oliver Neukum <oneukum@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

:040000 040000 c4fee9ea0fef25926229d810d19dc2f89cca9401
8b165a35d16280d2413b2700a6080ef290ca1009 M	drivers

The "no DMA on stack" conversion was incomplete with respect to
updating the arguments passed to usb_control_msg.  The value 40 is
hardcoded as it was prior to conversion.

The driver can now load firmware, but is not fully functional.

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
Cc: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent 89cb7e7f

drivers/staging/at76_usb/at76_usb.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -649,7 +649,7 @@ static int at76_get_op_mode(struct usb_device *udev)
		return -ENOMEM;
		ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33,
		USB_TYPE_VENDOR \| USB_DIR_IN \|
		USB_RECIP_INTERFACE, 0x01, 0, &op_mode, 1,
		USB_RECIP_INTERFACE, 0x01, 0, op_mode, 1,
		USB_CTRL_GET_TIMEOUT);
		saved = *op_mode;
		kfree(op_mode);
		@@ -782,7 +782,7 @@ static inline int at76_get_cmd_status(struct usb_device *udev, u8 cmd)
		ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x22,
		USB_TYPE_VENDOR \| USB_DIR_IN \|
		USB_RECIP_INTERFACE, cmd, 0, stat_buf,
		sizeof(stat_buf), USB_CTRL_GET_TIMEOUT);
		40, USB_CTRL_GET_TIMEOUT);
		if (ret >= 0)
		ret = stat_buf[5];
		kfree(stat_buf);