Change in coreboot[master]: device/device_util: Fix encoding the USB device path

[Karthik Ramasubramanian (Code Review)]

Hello Karthikeyan Ramasubramanian,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/34245

to review the following change.

Change subject: device/device_util: Fix encoding the USB device path
......................................................................

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 
Change-Id: I79317da6d9c7cd177bd7bbbba1f1ccebe076930a
---
M src/device/device_util.c
1 file changed, 1 insertion(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/34245/1

diff --git a/src/device/device_util.c b/src/device/device_util.c
index 11954a1..7ded1df 100644
--- a/src/device/device_util.c
+++ b/src/device/device_util.c
@@ -145,7 +145,7 @@
    	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 */

[Patrick Georgi (Code Review)]

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34245 )

Change subject: device/device_util: Fix encoding the USB device path
......................................................................

Patch Set 1: Code-Review+2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34245 )

Change subject: device/device_util: Fix encoding the USB device path
......................................................................

Patch Set 1: Code-Review+2

[Martin Roth (Code Review)]

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34245 )

Change subject: device/device_util: Fix encoding the USB device path
......................................................................

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 
Change-Id: I79317da6d9c7cd177bd7bbbba1f1ccebe076930a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34245
Reviewed-by: Patrick Georgi 
Reviewed-by: Furquan Shaikh 
Tested-by: build bot (Jenkins) 
---
M src/device/device_util.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, approved
  Furquan Shaikh: Looks good to me, approved

diff --git a/src/device/device_util.c b/src/device/device_util.c
index 11954a1..7ded1df 100644
--- a/src/device/device_util.c
+++ b/src/device/device_util.c
@@ -145,7 +145,7 @@
    	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 */