git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-23 05:56:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Backmerge tag 'v4.12-rc7' into drm-next

Browse Source 
Linux 4.12-rc7

Needed at least rc6 for drm-misc-next-fixes, may as well go to rc7
This commit is contained in:
Dave Airlie
2017-06-27 07:24:49 +10:00
parent 338ffbf7cb c0bc126f97
commit 6d61e70ccc
461 changed files with 4150 additions and 2756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/host1x/dev.c
View File

@@ -172,7 +172,7 @@ static int host1x_probe(struct platform_device *pdev)
host->rst = devm_reset_control_get(&pdev->dev, "host1x");
if (IS_ERR(host->rst)) {
err = PTR_ERR(host->clk);
err = PTR_ERR(host->rst);
dev_err(&pdev->dev, "failed to get reset: %d\n", err);
return err;
}