* [PATCHv2] USB: zaurus: support another broken Zaurus
@ 2022-02-10 15:59 Oliver Neukum
2022-02-10 16:51 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Oliver Neukum @ 2022-02-10 15:59 UTC (permalink / raw)
To: linux-usb, netdev, davem, kuba, gregKH; +Cc: Oliver Neukum, Ross Maynard
This SL-6000 says Direct Line, not Ethernet
v2: added Reporter and Link
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Reported-by: Ross Maynard <bids.7405@bigpond.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=215361
---
drivers/net/usb/cdc_ether.c | 12 ++++++++++++
drivers/net/usb/zaurus.c | 12 ++++++++++++
2 files changed, 24 insertions(+)
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index eb3817d70f2b..9b4dfa3001d6 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -583,6 +583,11 @@ static const struct usb_device_id products[] = {
.bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \
.bInterfaceProtocol = USB_CDC_PROTO_NONE
+#define ZAURUS_FAKE_INTERFACE \
+ .bInterfaceClass = USB_CLASS_COMM, \
+ .bInterfaceSubClass = USB_CDC_SUBCLASS_MDLM, \
+ .bInterfaceProtocol = USB_CDC_PROTO_NONE
+
/* SA-1100 based Sharp Zaurus ("collie"), or compatible;
* wire-incompatible with true CDC Ethernet implementations.
* (And, it seems, needlessly so...)
@@ -636,6 +641,13 @@ static const struct usb_device_id products[] = {
.idProduct = 0x9032, /* SL-6000 */
ZAURUS_MASTER_INTERFACE,
.driver_info = 0,
+}, {
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x04DD,
+ .idProduct = 0x9032, /* SL-6000 */
+ ZAURUS_FAKE_INTERFACE,
+ .driver_info = 0,
}, {
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
| USB_DEVICE_ID_MATCH_DEVICE,
diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c
index 8e717a0b559b..5289b6e31713 100644
--- a/drivers/net/usb/zaurus.c
+++ b/drivers/net/usb/zaurus.c
@@ -256,6 +256,11 @@ static const struct usb_device_id products [] = {
.bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \
.bInterfaceProtocol = USB_CDC_PROTO_NONE
+#define ZAURUS_FAKE_INTERFACE \
+ .bInterfaceClass = USB_CLASS_COMM, \
+ .bInterfaceSubClass = USB_CDC_SUBCLASS_MDLM, \
+ .bInterfaceProtocol = USB_CDC_PROTO_NONE
+
/* SA-1100 based Sharp Zaurus ("collie"), or compatible. */
{
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
@@ -313,6 +318,13 @@ static const struct usb_device_id products [] = {
.idProduct = 0x9032, /* SL-6000 */
ZAURUS_MASTER_INTERFACE,
.driver_info = ZAURUS_PXA_INFO,
+}, {
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x04DD,
+ .idProduct = 0x9032, /* SL-6000 */
+ ZAURUS_FAKE_INTERFACE,
+ .driver_info = (unsigned long) &bogus_mdlm_info,
}, {
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
| USB_DEVICE_ID_MATCH_DEVICE,
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCHv2] USB: zaurus: support another broken Zaurus
2022-02-10 15:59 [PATCHv2] USB: zaurus: support another broken Zaurus Oliver Neukum
@ 2022-02-10 16:51 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2022-02-10 16:51 UTC (permalink / raw)
To: Oliver Neukum; +Cc: linux-usb, netdev, davem, kuba, Ross Maynard
On Thu, Feb 10, 2022 at 04:59:11PM +0100, Oliver Neukum wrote:
> This SL-6000 says Direct Line, not Ethernet
>
> v2: added Reporter and Link
This line goes below the --- line, right?
>
> Signed-off-by: Oliver Neukum <oneukum@suse.com>
> Reported-by: Ross Maynard <bids.7405@bigpond.com>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=215361
> ---
> drivers/net/usb/cdc_ether.c | 12 ++++++++++++
> drivers/net/usb/zaurus.c | 12 ++++++++++++
> 2 files changed, 24 insertions(+)
>
> diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
> index eb3817d70f2b..9b4dfa3001d6 100644
> --- a/drivers/net/usb/cdc_ether.c
> +++ b/drivers/net/usb/cdc_ether.c
> @@ -583,6 +583,11 @@ static const struct usb_device_id products[] = {
> .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \
> .bInterfaceProtocol = USB_CDC_PROTO_NONE
>
> +#define ZAURUS_FAKE_INTERFACE \
> + .bInterfaceClass = USB_CLASS_COMM, \
> + .bInterfaceSubClass = USB_CDC_SUBCLASS_MDLM, \
> + .bInterfaceProtocol = USB_CDC_PROTO_NONE
> +
> /* SA-1100 based Sharp Zaurus ("collie"), or compatible;
> * wire-incompatible with true CDC Ethernet implementations.
> * (And, it seems, needlessly so...)
> @@ -636,6 +641,13 @@ static const struct usb_device_id products[] = {
> .idProduct = 0x9032, /* SL-6000 */
> ZAURUS_MASTER_INTERFACE,
> .driver_info = 0,
> +}, {
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x04DD,
> + .idProduct = 0x9032, /* SL-6000 */
> + ZAURUS_FAKE_INTERFACE,
> + .driver_info = 0,
> }, {
> .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> | USB_DEVICE_ID_MATCH_DEVICE,
> diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c
> index 8e717a0b559b..5289b6e31713 100644
> --- a/drivers/net/usb/zaurus.c
> +++ b/drivers/net/usb/zaurus.c
> @@ -256,6 +256,11 @@ static const struct usb_device_id products [] = {
> .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \
> .bInterfaceProtocol = USB_CDC_PROTO_NONE
>
> +#define ZAURUS_FAKE_INTERFACE \
> + .bInterfaceClass = USB_CLASS_COMM, \
> + .bInterfaceSubClass = USB_CDC_SUBCLASS_MDLM, \
> + .bInterfaceProtocol = USB_CDC_PROTO_NONE
> +
> /* SA-1100 based Sharp Zaurus ("collie"), or compatible. */
> {
> .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> @@ -313,6 +318,13 @@ static const struct usb_device_id products [] = {
> .idProduct = 0x9032, /* SL-6000 */
> ZAURUS_MASTER_INTERFACE,
> .driver_info = ZAURUS_PXA_INFO,
> +}, {
> + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> + | USB_DEVICE_ID_MATCH_DEVICE,
> + .idVendor = 0x04DD,
> + .idProduct = 0x9032, /* SL-6000 */
> + ZAURUS_FAKE_INTERFACE,
> + .driver_info = (unsigned long) &bogus_mdlm_info,
> }, {
> .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
> | USB_DEVICE_ID_MATCH_DEVICE,
Did you run this through checkpatch? You forgot the leading tabs here
in this last chunk again :(
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-10 16:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-10 15:59 [PATCHv2] USB: zaurus: support another broken Zaurus Oliver Neukum
2022-02-10 16:51 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).