* [patch] [media] v4l2-mc: using logical instead of bitwise OR
@ 2016-02-27 10:47 Dan Carpenter
0 siblings, 0 replies; only message in thread
From: Dan Carpenter @ 2016-02-27 10:47 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-media, kernel-janitors
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>
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;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-02-27 10:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-27 10:47 [patch] [media] v4l2-mc: using logical instead of bitwise OR Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox