diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 14:37:57 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 14:37:57 -0500 |
| commit | ad2e6329666650d9cafcae9ef53fbe09ea759ae2 (patch) | |
| tree | b23eb258fa609be246bb44cd9b33ff86d8142ca7 /drivers/isdn/hardware/mISDN/w6692.c | |
| parent | 1ee0a224bc9aad1de496c795f96bc6ba2c394811 (diff) | |
| parent | b810075002c9f25a6da83cecda39d789000a04a9 (diff) | |
Merge tag 'fixes-for-v3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v3.8-rc5
Finally we have a build fix for fsl-mxc-udc UDC driver.
We also have a fix for ep0 maxburst setting on DWC3
which could confuse the HW if we tell it we had way
too many streams on that endpoint when it _has_ to be
only one.
cppi_dma support for MUSB got a fix when running as a
module. By dropping the wrong __init annotation, the
function will be available even when we're modules and
we're done with .init.text section.
Last, but not least, we have a fix on FunctionFS which
was causing a bug on our option parsing algorithm.
Diffstat (limited to 'drivers/isdn/hardware/mISDN/w6692.c')
| -rw-r--r-- | drivers/isdn/hardware/mISDN/w6692.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c index 335fe6455002..de69f6828c76 100644 --- a/drivers/isdn/hardware/mISDN/w6692.c +++ b/drivers/isdn/hardware/mISDN/w6692.c | |||
| @@ -1355,7 +1355,7 @@ error_setup: | |||
| 1355 | return err; | 1355 | return err; |
| 1356 | } | 1356 | } |
| 1357 | 1357 | ||
| 1358 | static int __devinit | 1358 | static int |
| 1359 | w6692_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | 1359 | w6692_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
| 1360 | { | 1360 | { |
| 1361 | int err = -ENOMEM; | 1361 | int err = -ENOMEM; |
| @@ -1387,7 +1387,7 @@ w6692_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 1387 | return err; | 1387 | return err; |
| 1388 | } | 1388 | } |
| 1389 | 1389 | ||
| 1390 | static void __devexit | 1390 | static void |
| 1391 | w6692_remove_pci(struct pci_dev *pdev) | 1391 | w6692_remove_pci(struct pci_dev *pdev) |
| 1392 | { | 1392 | { |
| 1393 | struct w6692_hw *card = pci_get_drvdata(pdev); | 1393 | struct w6692_hw *card = pci_get_drvdata(pdev); |
| @@ -1414,7 +1414,7 @@ MODULE_DEVICE_TABLE(pci, w6692_ids); | |||
| 1414 | static struct pci_driver w6692_driver = { | 1414 | static struct pci_driver w6692_driver = { |
| 1415 | .name = "w6692", | 1415 | .name = "w6692", |
| 1416 | .probe = w6692_probe, | 1416 | .probe = w6692_probe, |
| 1417 | .remove = __devexit_p(w6692_remove_pci), | 1417 | .remove = w6692_remove_pci, |
| 1418 | .id_table = w6692_ids, | 1418 | .id_table = w6692_ids, |
| 1419 | }; | 1419 | }; |
| 1420 | 1420 | ||