summaryrefslogtreecommitdiff
path: root/drivers/edac
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2022-03-08 10:48:37 +0300
committerJoel Stanley <joel@jms.id.au>2022-03-08 10:48:40 +0300
commitc4c3fba61580d267568c5c9cf10c928a41ba38a4 (patch)
tree96e9f51838e6b792a9d099c7580faeb51eb7d5bd /drivers/edac
parentde0980ea2d5360bd1d7472e62231a03c108f20c2 (diff)
parent8993e6067f263765fd26edabf3e3012e3ec4d81e (diff)
downloadlinux-c4c3fba61580d267568c5c9cf10c928a41ba38a4.tar.xz
Merge tag 'v5.15.26' into dev-5.15
This is the 5.15.26 stable release Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/edac_mc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 2c5975674723..a859ddd9d4a1 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -215,7 +215,7 @@ void *edac_align_ptr(void **p, unsigned int size, int n_elems)
else
return (char *)ptr;
- r = (unsigned long)p % align;
+ r = (unsigned long)ptr % align;
if (r == 0)
return (char *)ptr;