aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/ohci.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 9815137b7c7d..a387bcd62466 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -2395,17 +2395,17 @@ static int __devinit pci_probe(struct pci_dev *dev,
2395 OHCI1394_AsRspTrContextControlSet, handle_at_packet); 2395 OHCI1394_AsRspTrContextControlSet, handle_at_packet);
2396 2396
2397 reg_write(ohci, OHCI1394_IsoRecvIntMaskSet, ~0); 2397 reg_write(ohci, OHCI1394_IsoRecvIntMaskSet, ~0);
2398 ohci->it_context_mask = reg_read(ohci, OHCI1394_IsoRecvIntMaskSet); 2398 ohci->ir_context_channels = ~0ULL;
2399 ohci->ir_context_mask = reg_read(ohci, OHCI1394_IsoRecvIntMaskSet);
2399 reg_write(ohci, OHCI1394_IsoRecvIntMaskClear, ~0); 2400 reg_write(ohci, OHCI1394_IsoRecvIntMaskClear, ~0);
2400 size = sizeof(struct iso_context) * hweight32(ohci->it_context_mask); 2401 size = sizeof(struct iso_context) * hweight32(ohci->ir_context_mask);
2401 ohci->it_context_list = kzalloc(size, GFP_KERNEL); 2402 ohci->ir_context_list = kzalloc(size, GFP_KERNEL);
2402 2403
2403 reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, ~0); 2404 reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, ~0);
2404 ohci->ir_context_channels = ~0ULL; 2405 ohci->it_context_mask = reg_read(ohci, OHCI1394_IsoXmitIntMaskSet);
2405 ohci->ir_context_mask = reg_read(ohci, OHCI1394_IsoXmitIntMaskSet);
2406 reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, ~0); 2406 reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, ~0);
2407 size = sizeof(struct iso_context) * hweight32(ohci->ir_context_mask); 2407 size = sizeof(struct iso_context) * hweight32(ohci->it_context_mask);
2408 ohci->ir_context_list = kzalloc(size, GFP_KERNEL); 2408 ohci->it_context_list = kzalloc(size, GFP_KERNEL);
2409 2409
2410 if (ohci->it_context_list == NULL || ohci->ir_context_list == NULL) { 2410 if (ohci->it_context_list == NULL || ohci->ir_context_list == NULL) {
2411 err = -ENOMEM; 2411 err = -ENOMEM;