2 files changed, 7 insertions, 9 deletions

diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index b8de8ddd6d98..435fcc75d706 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -372,6 +372,7 @@ static const struct ethtool_ops cdc_ncm_ethtool_ops = {
 
 int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_altsetting)
 {
+        const struct usb_cdc_union_desc *union_desc = NULL;
         struct cdc_ncm_ctx *ctx;
         struct usb_driver *driver;
         u8 *buf;
@@ -406,16 +407,15 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
 
                 switch (buf[2]) {
                 case USB_CDC_UNION_TYPE:
-                        if (buf[0] < sizeof(*(ctx->union_desc)))
+                        if (buf[0] < sizeof(*union_desc))
                                 break;
 
-                        ctx->union_desc =
-                                        (const struct usb_cdc_union_desc *)buf;
+                        union_desc = (const struct usb_cdc_union_desc *)buf;
 
                         ctx->control = usb_ifnum_to_if(dev->udev,
-                                        ctx->union_desc->bMasterInterface0);
+                                                       union_desc->bMasterInterface0);
                         ctx->data = usb_ifnum_to_if(dev->udev,
-                                        ctx->union_desc->bSlaveInterface0);
+                                                    union_desc->bSlaveInterface0);
                         break;
 
                 case USB_CDC_ETHERNET_TYPE:
@@ -458,7 +458,7 @@ advance:
         }
 
         /* some buggy devices have an IAD but no CDC Union */
-        if (!ctx->union_desc && intf->intf_assoc && intf->intf_assoc->bInterfaceCount == 2) {
+        if (!union_desc && intf->intf_assoc && intf->intf_assoc->bInterfaceCount == 2) {
                 ctx->control = intf;
                 ctx->data = usb_ifnum_to_if(dev->udev, intf->cur_altsetting->desc.bInterfaceNumber + 1);
                 dev_dbg(&intf->dev, "CDC Union missing - got slave from IAD\n");
diff --git a/include/linux/usb/cdc_ncm.h b/include/linux/usb/cdc_ncm.h
index 89b52a0fe4b9..cad54ad4ad12 100644
--- a/include/linux/usb/cdc_ncm.h
+++ b/include/linux/usb/cdc_ncm.h
@@ -92,9 +92,7 @@ struct cdc_ncm_ctx {
         struct tasklet_struct bh;
 
         const struct usb_cdc_ncm_desc *func_desc;
-        const struct usb_cdc_mbim_desc   *mbim_desc;
-        const struct usb_cdc_header_desc *header_desc;
-        const struct usb_cdc_union_desc *union_desc;
+        const struct usb_cdc_mbim_desc *mbim_desc;
         const struct usb_cdc_ether_desc *ether_desc;
 
         struct usb_interface *control;