v4l2-mc: using logical instead of bitwise OR

PATCH New Dan Carpenter 1 participant 1 message Feb 27, 2016

Subsystems (2)

Media (V4L/DVB) Kernel janitors

lore

Share & tools

lore

Dan Carpenter

author

2016-02-27 10:47 UTC #0 lore raw

PATCH 1/1 v4l2-mc: using logical instead of bitwise OR

We intended to do a bitwise OR here but there is a typo so we do a logical || instead.

Fixes 7047f2982a22 ('[media] v4l2-mc: add an ancillary routine for PCI-based MC')

Signed-off-by Dan Carpenter <[email protected]>

drivers/media/v4l2-core/v4l2-mc.c +2 -2

index a7f41b3..523998a 100644
@@ -40,8 +40,8 @@ struct media_device *v4l2_mc_pci_media_device_init(struct pci_dev *pci_dev,
 
 	sprintf(mdev->bus_info, "PCI:%s", pci_name(pci_dev));
 
-	mdev->hw_revision = pci_dev->subsystem_vendor << 16
-			    || pci_dev->subsystem_device;
+	mdev->hw_revision = pci_dev->subsystem_vendor << 16 |
+			    pci_dev->subsystem_device;
 
 	mdev->driver_version = LINUX_VERSION_CODE;