瀏覽代碼

[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>
Mauro Carvalho Chehab 9 年之前
父節點
當前提交
8e9a8b1212
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/media/v4l2-core/v4l2-mc.c

+ 2 - 2
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));
 	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;
 	mdev->driver_version = LINUX_VERSION_CODE;