Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream PRs #2

Merged
merged 13 commits into from
Mar 20, 2020
Prev Previous commit
Next Next commit
Merge branch 'master' into clear-status-unmask
ben9923 authored Oct 25, 2019
commit 0455b5c399d2f8a81b0a8920e4f0d97f02de6e05
2 changes: 1 addition & 1 deletion VoodooGPIO/VoodooGPIO.cpp
Original file line number Diff line number Diff line change
@@ -141,7 +141,7 @@ IOVirtualAddress VoodooGPIO::intel_get_padcfg(unsigned pin, unsigned reg) {
nregs = (community->features & PINCTRL_FEATURE_DEBOUNCE) ? 4 : 2;

if (reg >= nregs * 4)
return NULL;
return 0;

return community->pad_regs + reg + padno * nregs * 4;
}
You are viewing a condensed version of this merge commit. You can view the full changes here.