apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown
2013-10-25 09:51:21 +01:00
parent 2ef2e60d2f db9371b853
commit 52d85ebb7b
24 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/spi/spi-clps711x.c
+1 -3
View File
@@ -229,7 +229,7 @@ static int spi_clps711x_probe(struct platform_device *pdev)
goto clk_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",
@@ -260,8 +260,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
if (gpio_is_valid(hw->chipselect[i]))
gpio_free(hw->chipselect[i]);
spi_unregister_master(master);
return 0;
}