| Message ID | 20160227104752.GC14086@mwanda (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c index a7f41b3..523998a 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;
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 <dan.carpenter@oracle.com> -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html