Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'usb-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB / Thunderbolt fixes and ids from Greg KH:
"Here are four small patches for USB and Thunderbolt for 6.6-rc7 that
do the following:
- new usb-serial device ids
- thunderbolt driver fix for reported issue
All of these have been in linux-next with no reported problems"
* tag 'usb-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
USB: serial: option: add Fibocom to DELL custom modem FM101R-GL
USB: serial: option: add entry for Sierra EM9191 with new firmware
USB: serial: option: add Telit LE910C4-WWX 0x1035 composition
thunderbolt: Call tb_switch_put() once DisplayPort bandwidth request is finished
+13
-4
+6
-4
drivers/thunderbolt/tb.c
+6
-4
drivers/thunderbolt/tb.c
···
1907
1907
in = &sw->ports[ev->port];
1908
1908
if (!tb_port_is_dpin(in)) {
1909
1909
tb_port_warn(in, "bandwidth request to non-DP IN adapter\n");
1910
-
goto unlock;
1910
+
goto put_sw;
1911
1911
}
1912
1912
1913
1913
tb_port_dbg(in, "handling bandwidth allocation request\n");
1914
1914
1915
1915
if (!usb4_dp_port_bandwidth_mode_enabled(in)) {
1916
1916
tb_port_warn(in, "bandwidth allocation mode not enabled\n");
1917
-
goto unlock;
1917
+
goto put_sw;
1918
1918
}
1919
1919
1920
1920
ret = usb4_dp_port_requested_bandwidth(in);
···
1923
1923
tb_port_dbg(in, "no bandwidth request active\n");
1924
1924
else
1925
1925
tb_port_warn(in, "failed to read requested bandwidth\n");
1926
-
goto unlock;
1926
+
goto put_sw;
1927
1927
}
1928
1928
requested_bw = ret;
1929
1929
···
1932
1932
tunnel = tb_find_tunnel(tb, TB_TUNNEL_DP, in, NULL);
1933
1933
if (!tunnel) {
1934
1934
tb_port_warn(in, "failed to find tunnel\n");
1935
-
goto unlock;
1935
+
goto put_sw;
1936
1936
}
1937
1937
1938
1938
out = tunnel->dst_port;
···
1959
1959
tb_recalc_estimated_bandwidth(tb);
1960
1960
}
1961
1961
1962
+
put_sw:
1963
+
tb_switch_put(sw);
1962
1964
unlock:
1963
1965
mutex_unlock(&tb->lock);
1964
1966
+7
drivers/usb/serial/option.c
+7
drivers/usb/serial/option.c
···
203
203
#define DELL_PRODUCT_5829E_ESIM 0x81e4
204
204
#define DELL_PRODUCT_5829E 0x81e6
205
205
206
+
#define DELL_PRODUCT_FM101R 0x8213
207
+
#define DELL_PRODUCT_FM101R_ESIM 0x8215
208
+
206
209
#define KYOCERA_VENDOR_ID 0x0c88
207
210
#define KYOCERA_PRODUCT_KPC650 0x17da
208
211
#define KYOCERA_PRODUCT_KPC680 0x180a
···
1111
1108
.driver_info = RSVD(0) | RSVD(6) },
1112
1109
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5829E_ESIM),
1113
1110
.driver_info = RSVD(0) | RSVD(6) },
1111
+
{ USB_DEVICE_INTERFACE_CLASS(DELL_VENDOR_ID, DELL_PRODUCT_FM101R, 0xff) },
1112
+
{ USB_DEVICE_INTERFACE_CLASS(DELL_VENDOR_ID, DELL_PRODUCT_FM101R_ESIM, 0xff) },
1114
1113
{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, /* ADU-E100, ADU-310 */
1115
1114
{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
1116
1115
{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) },
···
1295
1290
.driver_info = NCTRL(0) | RSVD(3) },
1296
1291
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1033, 0xff), /* Telit LE910C1-EUX (ECM) */
1297
1292
.driver_info = NCTRL(0) },
1293
+
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1035, 0xff) }, /* Telit LE910C4-WWX (ECM) */
1298
1294
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG0),
1299
1295
.driver_info = RSVD(0) | RSVD(1) | NCTRL(2) | RSVD(3) },
1300
1296
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG1),
···
2268
2262
{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1406, 0xff) }, /* GosunCn GM500 ECM/NCM */
2269
2263
{ USB_DEVICE_AND_INTERFACE_INFO(OPPO_VENDOR_ID, OPPO_PRODUCT_R11, 0xff, 0xff, 0x30) },
2270
2264
{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x30) },
2265
+
{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x40) },
2271
2266
{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0, 0) },
2272
2267
{ USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, TOZED_PRODUCT_LT70C, 0xff, 0, 0) },
2273
2268
{ } /* Terminating entry */