summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-19 12:28:19 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-23 07:14:50 -0300
commit8e9a8b1212da7a68eb57beec6e16f80ff4f27e6f (patch)
treea107c3cb47e61c4cef7eed963106b54028096605
parentdfa7ba5f61f6773cd1ebcaf6672d9c179b32d1b0 (diff)
downloadlinux-8e9a8b1212da7a68eb57beec6e16f80ff4f27e6f.tar.bz2
[media] v4l2-mc: fix hardware version for PCI devices
It should be a bitwise or, and not a logical one. Also, add parenthesis, to make sure it will be applied in the right order. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/v4l2-core/v4l2-mc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c
index a7f41b323522..64eefb9ffb7e 100644
--- a/drivers/media/v4l2-core/v4l2-mc.c
+++ b/drivers/media/v4l2-core/v4l2-mc.c
@@ -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;