iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'spi/topic/orion' into spi-next

Browse Source
This commit is contained in:
Mark Brown 2013-10-25 09:51:35 +01:00
commit 3135ba82a1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/spi/spi-orion.c
View File

@ -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_clrbits(orion_spi, ORION_SPI_IF_CONFIG_REG,
ORION_SPI_IF_8_16_BIT_MODE); ORION_SPI_IF_8_16_BIT_MODE);
} else { } else {
pr_debug("Bad bits per word value %d (only 8 or 16 are " pr_debug("Bad bits per word value %d (only 8 or 16 are allowed).\n",
"allowed).\n", size); size);
return -EINVAL; return -EINVAL;
} }
@ -407,7 +407,7 @@ static int orion_spi_probe(struct platform_device *pdev)
const u32 *iprop; const u32 *iprop;
int size; int size;
master = spi_alloc_master(&pdev->dev, sizeof *spi); master = spi_alloc_master(&pdev->dev, sizeof(*spi));
if (master == NULL) { if (master == NULL) {
dev_dbg(&pdev->dev, "master allocation failed\n"); dev_dbg(&pdev->dev, "master allocation failed\n");
return -ENOMEM; return -ENOMEM;