aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/fw-ohci.c6
-rw-r--r--drivers/firewire/fw-sbp2.c2
-rw-r--r--drivers/firewire/fw-topology.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 96c8ac5b86cc..41476abc0693 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1934,12 +1934,12 @@ static int pci_suspend(struct pci_dev *pdev, pm_message_t state)
1934 free_irq(pdev->irq, ohci); 1934 free_irq(pdev->irq, ohci);
1935 err = pci_save_state(pdev); 1935 err = pci_save_state(pdev);
1936 if (err) { 1936 if (err) {
1937 fw_error("pci_save_state failed with %d", err); 1937 fw_error("pci_save_state failed\n");
1938 return err; 1938 return err;
1939 } 1939 }
1940 err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); 1940 err = pci_set_power_state(pdev, pci_choose_state(pdev, state));
1941 if (err) { 1941 if (err) {
1942 fw_error("pci_set_power_state failed with %d", err); 1942 fw_error("pci_set_power_state failed\n");
1943 return err; 1943 return err;
1944 } 1944 }
1945 1945
@@ -1955,7 +1955,7 @@ static int pci_resume(struct pci_dev *pdev)
1955 pci_restore_state(pdev); 1955 pci_restore_state(pdev);
1956 err = pci_enable_device(pdev); 1956 err = pci_enable_device(pdev);
1957 if (err) { 1957 if (err) {
1958 fw_error("pci_enable_device failed with %d", err); 1958 fw_error("pci_enable_device failed\n");
1959 return err; 1959 return err;
1960 } 1960 }
1961 1961
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index 25f2aa430a30..16e942f72e48 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -985,7 +985,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
985 * transfer direction not handled. 985 * transfer direction not handled.
986 */ 986 */
987 if (cmd->sc_data_direction == DMA_BIDIRECTIONAL) { 987 if (cmd->sc_data_direction == DMA_BIDIRECTIONAL) {
988 fw_error("Cannot handle DMA_BIDIRECTIONAL - rejecting command"); 988 fw_error("Can't handle DMA_BIDIRECTIONAL, rejecting command\n");
989 cmd->result = DID_ERROR << 16; 989 cmd->result = DID_ERROR << 16;
990 done(cmd); 990 done(cmd);
991 return 0; 991 return 0;
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index 7aebb8ae0efa..4e358506d913 100644
--- a/drivers/firewire/fw-topology.c
+++ b/drivers/firewire/fw-topology.c
@@ -214,7 +214,7 @@ static struct fw_node *build_tree(struct fw_card *card,
214 214
215 node = fw_node_create(q, port_count, card->color); 215 node = fw_node_create(q, port_count, card->color);
216 if (node == NULL) { 216 if (node == NULL) {
217 fw_error("Out of memory while building topology."); 217 fw_error("Out of memory while building topology.\n");
218 return NULL; 218 return NULL;
219 } 219 }
220 220