diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-08 17:36:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-08 17:36:40 +0200 |
| commit | 31e918908ccaf2b651ed8f666120f2a03a97193f (patch) | |
| tree | 39aab36ced1932d06cb2e3cee037faae0b94a63b /drivers/spi/spi-bcm63xx.c | |
| parent | USB: io_ti, stop dereferencing potential NULL (diff) | |
| parent | Linux 3.9-rc6 (diff) | |
| download | linux-31e918908ccaf2b651ed8f666120f2a03a97193f.tar.xz linux-31e918908ccaf2b651ed8f666120f2a03a97193f.zip | |
Merge 3.9-rc6 into usb-next
We want the fixes here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spi/spi-bcm63xx.c')
| -rw-r--r-- | drivers/spi/spi-bcm63xx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index 9578af782a77..d7df435d962e 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -152,7 +152,6 @@ static void bcm63xx_spi_setup_transfer(struct spi_device *spi, static int bcm63xx_spi_setup(struct spi_device *spi) { struct bcm63xx_spi *bs; - int ret; bs = spi_master_get_devdata(spi->master); @@ -490,7 +489,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) default: dev_err(dev, "unsupported MSG_CTL width: %d\n", bs->msg_ctl_width); - goto out_clk_disable; + goto out_err; } /* Initialize hardware */ |