diff options
| -rw-r--r-- | drivers/spi/spi-qup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 78c66e3c53ed..943f973a59aa 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c | |||
| @@ -287,7 +287,7 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id) | |||
| 287 | writel_relaxed(opflags, controller->base + QUP_OPERATIONAL); | 287 | writel_relaxed(opflags, controller->base + QUP_OPERATIONAL); |
| 288 | 288 | ||
| 289 | if (!xfer) { | 289 | if (!xfer) { |
| 290 | dev_err_ratelimited(controller->dev, "unexpected irq %x08 %x08 %x08\n", | 290 | dev_err_ratelimited(controller->dev, "unexpected irq %08x %08x %08x\n", |
| 291 | qup_err, spi_err, opflags); | 291 | qup_err, spi_err, opflags); |
| 292 | return IRQ_HANDLED; | 292 | return IRQ_HANDLED; |
| 293 | } | 293 | } |
| @@ -366,7 +366,7 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer) | |||
| 366 | n_words = xfer->len / w_size; | 366 | n_words = xfer->len / w_size; |
| 367 | controller->w_size = w_size; | 367 | controller->w_size = w_size; |
| 368 | 368 | ||
| 369 | if (n_words <= controller->in_fifo_sz) { | 369 | if (n_words <= (controller->in_fifo_sz / sizeof(u32))) { |
| 370 | mode = QUP_IO_M_MODE_FIFO; | 370 | mode = QUP_IO_M_MODE_FIFO; |
| 371 | writel_relaxed(n_words, controller->base + QUP_MX_READ_CNT); | 371 | writel_relaxed(n_words, controller->base + QUP_MX_READ_CNT); |
| 372 | writel_relaxed(n_words, controller->base + QUP_MX_WRITE_CNT); | 372 | writel_relaxed(n_words, controller->base + QUP_MX_WRITE_CNT); |
