From: Mark Brown Date: Fri, 25 Oct 2013 08:51:24 +0000 (+0100) Subject: Merge remote-tracking branch 'spi/topic/clps711x' into spi-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d42b70f5c733478313433b24e66a1ff605f852bd;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge remote-tracking branch 'spi/topic/clps711x' into spi-next --- d42b70f5c733478313433b24e66a1ff605f852bd diff --cc drivers/spi/spi-clps711x.c index 7f2fd33ad4d9,73b9a461853f..e2a5a426b2ef --- a/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",