summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarthikeyan Ramasubramanian <kramasub@chromium.org>2019-07-11 12:23:35 -0600
committerMartin Roth <martinroth@google.com>2019-07-13 18:29:47 +0000
commit19398245b498e2ced39f3828f804c94bb82e9a14 (patch)
treeb34480523222084ee2e3a8921701e1acaafa54a0
parentd06828da989fd22cf5699887b6bcccbbc8f1e086 (diff)
device/device_util: Fix encoding the USB device path
USB device id does not get included because of the logical OR operation. Fix encoding the USB device path. BUG=None BRANCH=None TEST=Boot to ChromeOS. Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com> Change-Id: I79317da6d9c7cd177bd7bbbba1f1ccebe076930a Reviewed-on: https://review.coreboot.org/c/coreboot/+/34245 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/device/device_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/device/device_util.c b/src/device/device_util.c
index 11954a1982..7ded1df435 100644
--- a/src/device/device_util.c
+++ b/src/device/device_util.c
@@ -145,7 +145,7 @@ u32 dev_path_encode(const struct device *dev)
ret |= dev->path.spi.cs;
break;
case DEVICE_PATH_USB:
- ret |= dev->path.usb.port_type << 8 || dev->path.usb.port_id;
+ ret |= dev->path.usb.port_type << 8 | dev->path.usb.port_id;
break;
case DEVICE_PATH_NONE:
case DEVICE_PATH_MMIO: /* don't care */