diff options
| author | Tony Luck <tony.luck@intel.com> | 2026-09-23 09:33:23 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2026-09-23 09:33:23 -0700 |
| commit | 01c8b24a06d1b10618d259b8dece48dab50d9605 (patch) | |
| tree | cbdbab0e72b4fbc6e9ff93d50daed057edfebb48 | |
| parent | feddf350407a6cdb7ce8418bbe70d13e8bf79d6e (diff) | |
| parent | cfc77cf89fa9cf29474fb90c02e44a4c546e5378 (diff) | |
| download | linux-next-01c8b24a06d1b10618d259b8dece48dab50d9605.tar.gz linux-next-01c8b24a06d1b10618d259b8dece48dab50d9605.zip | |
Merge branch 'edac-drivers' into edac-for-next
* edac-drivers
EDAC/skx_base: Fix ambiguous bitwise and logical operator style
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | drivers/edac/skx_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/skx_base.c b/drivers/edac/skx_base.c index de749413ff9a..ae2fda006632 100644 --- a/drivers/edac/skx_base.c +++ b/drivers/edac/skx_base.c @@ -356,7 +356,7 @@ sad_found: break; case 2: lchan = (addr >> shift) % 2; - lchan = (lchan << 1) | !lchan; + lchan = (lchan << 1) | (lchan ^ 1); break; case 3: lchan = ((addr >> shift) % 2) << 1; |