xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown
2013-09-01 13:49:03 +01:00
parent 11c28cfc1e b5f9a9d511
commit 68aa4cb337
30 changed files with 125 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/spi-nuc900.c
View File

@@ -350,7 +350,7 @@ static int nuc900_spi_probe(struct platform_device *pdev)
hw = spi_master_get_devdata(master);
hw->master = spi_master_get(master);
hw->pdata = pdev->dev.platform_data;
hw->pdata = dev_get_platdata(&pdev->dev);
hw->dev = &pdev->dev;
if (hw->pdata == NULL) {