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

diff --cc drivers/spi/spi-clps711x.c
index 7f2fd33ad4d918de4c60263d19840b1c9611c7ec,73b9a461853ffea12a3d34ad8b758a9a8804de1c..e2a5a426b2efc57038503ed7b64d00237e190b14
--- 1/drivers/spi/spi-clps711x.c
--- 2/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@@ -226,10 -226,10 +226,10 @@@ static int spi_clps711x_probe(struct pl
                               dev_name(&pdev->dev), hw);
        if (ret) {
                dev_err(&pdev->dev, "Can't request IRQ\n");
-               goto clk_out;
+               goto err_out;
        }
  
 -      ret = spi_register_master(master);
 +      ret = devm_spi_register_master(&pdev->dev, master);
        if (!ret) {
                dev_info(&pdev->dev,
                         "SPI bus driver initialized. Master clock %u Hz\n",