From: Mauro Carvalho Chehab Date: Fri, 19 Feb 2016 14:28:19 +0000 (-0200) Subject: [media] v4l2-mc: fix hardware version for PCI devices X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8e9a8b1212da7a68eb57beec6e16f80ff4f27e6f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git [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 --- 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;