projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: add support for the ADDBA extension element
[carl9170fw.git]
/
carlfw
/
usb
/
usb.c
diff --git
a/carlfw/usb/usb.c
b/carlfw/usb/usb.c
index d7bc4329ba8bad27bbac17bc2202d2c999abc49e..aedf30d1404830bb989e9ba8caeb4a459aee5fc1 100644
(file)
--- a/
carlfw/usb/usb.c
+++ b/
carlfw/usb/usb.c
@@
-19,8
+19,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; If not, see <http://www.gnu.org/licenses/>.
*/
#include "carl9170.h"
#include "usb.h"
*/
#include "carl9170.h"
#include "usb.h"
@@
-159,7
+158,7
@@
static struct ar9170_usb_config usb_config_fullspeed = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
.bEndpointAddress = USB_DIR_OUT | AR9170_USB_EP_CMD,
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
.bEndpointAddress = USB_DIR_OUT | AR9170_USB_EP_CMD,
- .bmAttributes = USB_ENDPOINT_XFER_
INT
,
+ .bmAttributes = USB_ENDPOINT_XFER_
BULK
,
.wMaxPacketSize = cpu_to_le16(64),
.bInterval = 1,
},
.wMaxPacketSize = cpu_to_le16(64),
.bInterval = 1,
},
@@
-516,6
+515,7
@@
static int usb_set_configuration(const struct usb_ctrlrequest *ctrl)
/* Disable Device */
andb(AR9170_USB_REG_DEVICE_ADDRESS,
(uint8_t) ~(AR9170_USB_DEVICE_ADDRESS_CONFIGURE));
/* Disable Device */
andb(AR9170_USB_REG_DEVICE_ADDRESS,
(uint8_t) ~(AR9170_USB_DEVICE_ADDRESS_CONFIGURE));
+ /* fall through */
case 1:
fw.usb.config = config;
case 1:
fw.usb.config = config;
@@
-528,7
+528,6
@@
static int usb_set_configuration(const struct usb_ctrlrequest *ctrl)
usb_init_fullspeed_fifo_cfg();
}
/* usb_pta_init() ? */
usb_init_fullspeed_fifo_cfg();
}
/* usb_pta_init() ? */
- break;
#endif /* CONFIG_CARL9170FW_USB_MODESWITCH */
usb_reset_eps();
#endif /* CONFIG_CARL9170FW_USB_MODESWITCH */
usb_reset_eps();