projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dma-mapping: add the device argument to dma_mapping_error()
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
firewire
/
fw-ohci.c
diff --git
a/drivers/firewire/fw-ohci.c
b/drivers/firewire/fw-ohci.c
index 0b66306af479e4d9fdd359dac87f335b31ae89b6..566672e0bcffbb6902d5174899b7b1933213847a 100644
(file)
--- a/
drivers/firewire/fw-ohci.c
+++ b/
drivers/firewire/fw-ohci.c
@@
-953,7
+953,7
@@
at_context_queue_packet(struct context *ctx, struct fw_packet *packet)
payload_bus =
dma_map_single(ohci->card.device, packet->payload,
packet->payload_length, DMA_TO_DEVICE);
payload_bus =
dma_map_single(ohci->card.device, packet->payload,
packet->payload_length, DMA_TO_DEVICE);
- if (dma_mapping_error(payload_bus)) {
+ if (dma_mapping_error(
ohci->card.device,
payload_bus)) {
packet->ack = RCODE_SEND_ERROR;
return -1;
}
packet->ack = RCODE_SEND_ERROR;
return -1;
}
@@
-2292,7
+2292,6
@@
ohci_queue_iso(struct fw_iso_context *base,
}
static const struct fw_card_driver ohci_driver = {
}
static const struct fw_card_driver ohci_driver = {
- .name = ohci_driver_name,
.enable = ohci_enable,
.update_phy_reg = ohci_update_phy_reg,
.set_config_rom = ohci_set_config_rom,
.enable = ohci_enable,
.update_phy_reg = ohci_update_phy_reg,
.set_config_rom = ohci_set_config_rom,