renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
Code

Merge remote-tracking branch 'spi/fix/hspi' into spi-linus

Browse Source
This commit is contained in:
Mark Brown 2013-10-07 14:51:58 +01:00
commit 78e9fa521e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/spi/spi-sh-hspi.c
View File

@ -296,6 +296,8 @@ static int hspi_probe(struct platform_device *pdev)
goto error1;
}
pm_runtime_enable(&pdev->dev);
master->num_chipselect = 1;
master->bus_num = pdev->id;
master->setup = hspi_setup;
@ -309,8 +311,6 @@ static int hspi_probe(struct platform_device *pdev)
goto error1;
}
pm_runtime_enable(&pdev->dev);
return 0;
error1: