diff options
Diffstat (limited to 'drivers/usb/gadget/net2280.c')
-rw-r--r-- | drivers/usb/gadget/net2280.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index 0781bff70015..fc852177c087 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c | |||
@@ -129,7 +129,7 @@ static char *type_string (u8 bmAttributes) | |||
129 | case USB_ENDPOINT_XFER_BULK: return "bulk"; | 129 | case USB_ENDPOINT_XFER_BULK: return "bulk"; |
130 | case USB_ENDPOINT_XFER_ISOC: return "iso"; | 130 | case USB_ENDPOINT_XFER_ISOC: return "iso"; |
131 | case USB_ENDPOINT_XFER_INT: return "intr"; | 131 | case USB_ENDPOINT_XFER_INT: return "intr"; |
132 | }; | 132 | } |
133 | return "control"; | 133 | return "control"; |
134 | } | 134 | } |
135 | #endif | 135 | #endif |
@@ -1630,7 +1630,7 @@ static ssize_t queues_show(struct device *_dev, struct device_attribute *attr, | |||
1630 | val = "intr"; break; | 1630 | val = "intr"; break; |
1631 | default: | 1631 | default: |
1632 | val = "iso"; break; | 1632 | val = "iso"; break; |
1633 | }; val; }), | 1633 | } val; }), |
1634 | usb_endpoint_maxp (d) & 0x1fff, | 1634 | usb_endpoint_maxp (d) & 0x1fff, |
1635 | ep->dma ? "dma" : "pio", ep->fifo_size | 1635 | ep->dma ? "dma" : "pio", ep->fifo_size |
1636 | ); | 1636 | ); |
@@ -2680,7 +2680,6 @@ static void net2280_remove (struct pci_dev *pdev) | |||
2680 | if (dev->enabled) | 2680 | if (dev->enabled) |
2681 | pci_disable_device (pdev); | 2681 | pci_disable_device (pdev); |
2682 | device_remove_file (&pdev->dev, &dev_attr_registers); | 2682 | device_remove_file (&pdev->dev, &dev_attr_registers); |
2683 | pci_set_drvdata (pdev, NULL); | ||
2684 | 2683 | ||
2685 | INFO (dev, "unbind\n"); | 2684 | INFO (dev, "unbind\n"); |
2686 | } | 2685 | } |