diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:35 +0100 |
| commit | 3135ba82a14f19a544e9050e8af27f54e08b8190 (patch) | |
| tree | 09ed7c5723ad7d5ab3630fc020bf9ecebbb7e626 /drivers/spi | |
| parent | 6c99db1eb880cd12c54c810abae7ea7976baf393 (diff) | |
| parent | 3fed8068fbad01b044c40c4df24bb97e853813ff (diff) | |
| download | linux-3135ba82a14f19a544e9050e8af27f54e08b8190.tar.bz2 | |
Merge remote-tracking branch 'spi/topic/orion' into spi-next
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-orion.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c index d96d67869d7b..744841e095e4 100644 --- a/drivers/spi/spi-orion.c +++ b/drivers/spi/spi-orion.c @@ -84,8 +84,8 @@ static int orion_spi_set_transfer_size(struct orion_spi *orion_spi, int size) orion_spi_clrbits(orion_spi, ORION_SPI_IF_CONFIG_REG, ORION_SPI_IF_8_16_BIT_MODE); } else { - pr_debug("Bad bits per word value %d (only 8 or 16 are " - "allowed).\n", size); + pr_debug("Bad bits per word value %d (only 8 or 16 are allowed).\n", + size); return -EINVAL; } @@ -407,7 +407,7 @@ static int orion_spi_probe(struct platform_device *pdev) const u32 *iprop; int size; - master = spi_alloc_master(&pdev->dev, sizeof *spi); + master = spi_alloc_master(&pdev->dev, sizeof(*spi)); if (master == NULL) { dev_dbg(&pdev->dev, "master allocation failed\n"); return -ENOMEM; |