diff options
| -rw-r--r-- | drivers/firewire/fw-ohci.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index 2f307c4df335..e4b9a7d17afc 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c | |||
| @@ -1459,7 +1459,7 @@ ohci_allocate_iso_context(struct fw_card *card, int type, size_t header_size) | |||
| 1459 | /* FIXME: We need a fallback for pre 1.1 OHCI. */ | 1459 | /* FIXME: We need a fallback for pre 1.1 OHCI. */ |
| 1460 | if (callback == handle_ir_dualbuffer_packet && | 1460 | if (callback == handle_ir_dualbuffer_packet && |
| 1461 | ohci->version < OHCI_VERSION_1_1) | 1461 | ohci->version < OHCI_VERSION_1_1) |
| 1462 | return ERR_PTR(-EINVAL); | 1462 | return ERR_PTR(-ENOSYS); |
| 1463 | 1463 | ||
| 1464 | spin_lock_irqsave(&ohci->lock, flags); | 1464 | spin_lock_irqsave(&ohci->lock, flags); |
| 1465 | index = ffs(*mask) - 1; | 1465 | index = ffs(*mask) - 1; |
| @@ -1778,7 +1778,7 @@ ohci_queue_iso(struct fw_iso_context *base, | |||
| 1778 | buffer, payload); | 1778 | buffer, payload); |
| 1779 | else | 1779 | else |
| 1780 | /* FIXME: Implement fallback for OHCI 1.0 controllers. */ | 1780 | /* FIXME: Implement fallback for OHCI 1.0 controllers. */ |
| 1781 | return -EINVAL; | 1781 | return -ENOSYS; |
| 1782 | } | 1782 | } |
| 1783 | 1783 | ||
| 1784 | static const struct fw_card_driver ohci_driver = { | 1784 | static const struct fw_card_driver ohci_driver = { |
| @@ -1898,7 +1898,12 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) | |||
| 1898 | ohci->version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff; | 1898 | ohci->version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff; |
| 1899 | fw_notify("Added fw-ohci device %s, OHCI version %x.%x\n", | 1899 | fw_notify("Added fw-ohci device %s, OHCI version %x.%x\n", |
| 1900 | dev->dev.bus_id, ohci->version >> 16, ohci->version & 0xff); | 1900 | dev->dev.bus_id, ohci->version >> 16, ohci->version & 0xff); |
| 1901 | 1901 | if (ohci->version < OHCI_VERSION_1_1) { | |
| 1902 | fw_notify(" Isochronous I/O is not yet implemented for " | ||
| 1903 | "OHCI 1.0 chips.\n"); | ||
| 1904 | fw_notify(" Cameras, audio devices etc. won't work on " | ||
| 1905 | "this controller with this driver version.\n"); | ||
| 1906 | } | ||
| 1902 | return 0; | 1907 | return 0; |
| 1903 | 1908 | ||
| 1904 | fail_self_id: | 1909 | fail_self_id: |
