add lvds1024*800

hc

2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920

 kernel/drivers/net/wireless/marvell/mwifiex/usb.c
..
..
@@ -1,10 +1,10 @@
1
1
 /*
2
- * Marvell Wireless LAN device driver: USB specific handling
2
+ * NXP Wireless LAN device driver: USB specific handling
3
3
  *
4
- * Copyright (C) 2012-2014, Marvell International Ltd.
4
+ * Copyright 2011-2020 NXP
5
5
  *
6
- * This software file (the "File") is distributed by Marvell International
7
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
6
+ * This software file (the "File") is distributed by NXP
7
+ * under the terms of the GNU General Public License Version 2, June 1991
8
8
  * (the "License").  You may use, redistribute and/or modify this File in
9
9
  * accordance with the terms and conditions of the License, a copy of which
10
10
  * is available by writing to the Free Software Foundation, Inc.,
..
..
@@ -1145,10 +1145,9 @@
1145
1145
 		from_timer(timer_context, t, hold_timer);
1146
1146
 	struct mwifiex_adapter *adapter = timer_context->adapter;
1147
1147
 	struct usb_tx_data_port *port = timer_context->port;
1148
-	unsigned long flags;
1149
1148
 	int err = 0;
1150
1149
 
1151
-	spin_lock_irqsave(&port->tx_aggr_lock, flags);
1150
+	spin_lock_bh(&port->tx_aggr_lock);
1152
1151
 	err = mwifiex_usb_prepare_tx_aggr_skb(adapter, port, &skb_send);
1153
1152
 	if (err) {
1154
1153
 		mwifiex_dbg(adapter, ERROR,
..
..
@@ -1175,7 +1174,7 @@
1175
1174
 	if (err == -1)
1176
1175
 		mwifiex_write_data_complete(adapter, skb_send, 0, -1);
1177
1176
 unlock:
1178
-	spin_unlock_irqrestore(&port->tx_aggr_lock, flags);
1177
+	spin_unlock_bh(&port->tx_aggr_lock);
1179
1178
 }
1180
1179
 
1181
1180
 /* This function write a command/data packet to card. */
..
..
@@ -1186,7 +1185,6 @@
1186
1185
 	struct usb_card_rec *card = adapter->card;
1187
1186
 	struct urb_context *context = NULL;
1188
1187
 	struct usb_tx_data_port *port = NULL;
1189
-	unsigned long flags;
1190
1188
 	int idx, ret;
1191
1189
 
1192
1190
 	if (test_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags)) {
..
..
@@ -1228,10 +1226,10 @@
1228
1226
 		}
1229
1227
 
1230
1228
 		if (adapter->bus_aggr.enable) {
1231
-			spin_lock_irqsave(&port->tx_aggr_lock, flags);
1229
+			spin_lock_bh(&port->tx_aggr_lock);
1232
1230
 			ret =  mwifiex_usb_aggr_tx_data(adapter, ep, skb,
1233
1231
 							tx_param, port);
1234
-			spin_unlock_irqrestore(&port->tx_aggr_lock, flags);
1232
+			spin_unlock_bh(&port->tx_aggr_lock);
1235
1233
 			return ret;
1236
1234
 		}
1237
1235