From 38089a30a6c1426cb3a93d8aaaecc2ed0ce30178 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 4 Jun 2013 18:52:05 +0100 Subject: [PATCH] --- yaml --- r: 376910 b: refs/heads/master c: c1d926a5d2280e35d87dea3128e826fe98776ed4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 2 +- trunk/drivers/spi/spi-sh-hspi.c | 2 +- trunk/drivers/spi/spi-topcliff-pch.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 669969a28673..23c5ec47b89b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68c315bb951d94210c43c52166d326f9c26f7ce8 +refs/heads/master: c1d926a5d2280e35d87dea3128e826fe98776ed4 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index f35a259a6564..1aa3762176f1 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -7614,7 +7614,7 @@ F: drivers/clk/spear/ SPI SUBSYSTEM M: Mark Brown M: Grant Likely -L: spi-devel-general@lists.sourceforge.net +L: linux-spi@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git Q: http://patchwork.kernel.org/project/spi-devel-general/list/ S: Maintained diff --git a/trunk/drivers/spi/spi-sh-hspi.c b/trunk/drivers/spi/spi-sh-hspi.c index 60cfae51c713..eab593eaaafa 100644 --- a/trunk/drivers/spi/spi-sh-hspi.c +++ b/trunk/drivers/spi/spi-sh-hspi.c @@ -89,7 +89,7 @@ static int hspi_status_check_timeout(struct hspi_priv *hspi, u32 mask, u32 val) if ((mask & hspi_read(hspi, SPSR)) == val) return 0; - msleep(20); + udelay(10); } dev_err(hspi->dev, "timeout\n"); diff --git a/trunk/drivers/spi/spi-topcliff-pch.c b/trunk/drivers/spi/spi-topcliff-pch.c index 35f60bd252dd..637d728fbeb5 100644 --- a/trunk/drivers/spi/spi-topcliff-pch.c +++ b/trunk/drivers/spi/spi-topcliff-pch.c @@ -1487,7 +1487,7 @@ static int pch_spi_pd_probe(struct platform_device *plat_dev) return 0; err_spi_register_master: - free_irq(board_dat->pdev->irq, board_dat); + free_irq(board_dat->pdev->irq, data); err_request_irq: pch_spi_free_resources(board_dat, data); err_spi_get_resources: @@ -1667,6 +1667,7 @@ static int pch_spi_probe(struct pci_dev *pdev, pd_dev = platform_device_alloc("pch-spi", i); if (!pd_dev) { dev_err(&pdev->dev, "platform_device_alloc failed\n"); + retval = -ENOMEM; goto err_platform_device; } pd_dev_save->pd_save[i] = pd_dev;