diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-19 12:28:19 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-23 07:14:50 -0300 |
| commit | 8e9a8b1212da7a68eb57beec6e16f80ff4f27e6f (patch) | |
| tree | a107c3cb47e61c4cef7eed963106b54028096605 /drivers/media/v4l2-core | |
| parent | dfa7ba5f61f6773cd1ebcaf6672d9c179b32d1b0 (diff) | |
| download | op-kernel-dev-8e9a8b1212da7a68eb57beec6e16f80ff4f27e6f.zip op-kernel-dev-8e9a8b1212da7a68eb57beec6e16f80ff4f27e6f.tar.gz | |
[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>
Diffstat (limited to 'drivers/media/v4l2-core')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-mc.c | 4 |
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 a7f41b3..64eefb9 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; |
