diff options
| -rw-r--r-- | drivers/firewire/ohci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 96768e160866..a61571c63c59 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
| @@ -2226,7 +2226,6 @@ static int ohci_queue_iso_receive_dualbuffer(struct fw_iso_context *base, | |||
| 2226 | if (rest == 0) | 2226 | if (rest == 0) |
| 2227 | return -EINVAL; | 2227 | return -EINVAL; |
| 2228 | 2228 | ||
| 2229 | /* FIXME: make packet-per-buffer/dual-buffer a context option */ | ||
| 2230 | while (rest > 0) { | 2229 | while (rest > 0) { |
| 2231 | d = context_get_descriptors(&ctx->context, | 2230 | d = context_get_descriptors(&ctx->context, |
| 2232 | z + header_z, &d_bus); | 2231 | z + header_z, &d_bus); |
| @@ -2470,7 +2469,10 @@ static int __devinit pci_probe(struct pci_dev *dev, | |||
| 2470 | } | 2469 | } |
| 2471 | 2470 | ||
| 2472 | version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff; | 2471 | version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff; |
| 2472 | #if 0 | ||
| 2473 | /* FIXME: make it a context option or remove dual-buffer mode */ | ||
| 2473 | ohci->use_dualbuffer = version >= OHCI_VERSION_1_1; | 2474 | ohci->use_dualbuffer = version >= OHCI_VERSION_1_1; |
| 2475 | #endif | ||
| 2474 | 2476 | ||
| 2475 | /* dual-buffer mode is broken if more than one IR context is active */ | 2477 | /* dual-buffer mode is broken if more than one IR context is active */ |
| 2476 | if (dev->vendor == PCI_VENDOR_ID_AGERE && | 2478 | if (dev->vendor == PCI_VENDOR_ID_AGERE && |
