Commit 12508e7d authored by corentin's avatar corentin Committed by Mark Brown
parent 181997b4
...@@ -447,8 +447,8 @@ static irqreturn_t au1550_spi_dma_irq_callback(struct au1550_spi *hw) ...@@ -447,8 +447,8 @@ static irqreturn_t au1550_spi_dma_irq_callback(struct au1550_spi *hw)
"dma transfer: receive FIFO overflow!\n"); "dma transfer: receive FIFO overflow!\n");
else else
dev_err(hw->dev, dev_err(hw->dev,
"dma transfer: unexpected SPI error " "dma transfer: unexpected SPI error (event=0x%x stat=0x%x)!\n",
"(event=0x%x stat=0x%x)!\n", evnt, stat); evnt, stat);
complete(&hw->master_done); complete(&hw->master_done);
return IRQ_HANDLED; return IRQ_HANDLED;
...@@ -567,8 +567,8 @@ static irqreturn_t au1550_spi_pio_irq_callback(struct au1550_spi *hw) ...@@ -567,8 +567,8 @@ static irqreturn_t au1550_spi_pio_irq_callback(struct au1550_spi *hw)
au1550_spi_mask_ack_all(hw); au1550_spi_mask_ack_all(hw);
au1550_spi_reset_fifos(hw); au1550_spi_reset_fifos(hw);
dev_err(hw->dev, dev_err(hw->dev,
"pio transfer: unexpected SPI error " "pio transfer: unexpected SPI error (event=0x%x stat=0x%x)!\n",
"(event=0x%x stat=0x%x)!\n", evnt, stat); evnt, stat);
complete(&hw->master_done); complete(&hw->master_done);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -972,8 +972,7 @@ static int __init au1550_spi_init(void) ...@@ -972,8 +972,7 @@ static int __init au1550_spi_init(void)
if (usedma) { if (usedma) {
ddma_memid = au1xxx_ddma_add_device(&au1550_spi_mem_dbdev); ddma_memid = au1xxx_ddma_add_device(&au1550_spi_mem_dbdev);
if (!ddma_memid) if (!ddma_memid)
printk(KERN_ERR "au1550-spi: cannot add memory" printk(KERN_ERR "au1550-spi: cannot add memory dbdma device\n");
"dbdma device\n");
} }
return platform_driver_register(&au1550_spi_drv); return platform_driver_register(&au1550_spi_drv);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment