Enhance via-camera drviers to use hotplug-safe iterators to walk
PCI buses.
Signed-off-by: Jiang Liu <jiang....@huawei.com>
Cc: Mauro Carvalho Chehab <mche...@redhat.com>
Cc: Daniel Drake <d...@laptop.org>
Cc: Jonathan Corbet <cor...@lwn.net>
Cc: Javier Martin <javier.mar...@vista-silicon.com>
Cc: linux-me...@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
drivers/media/platform/via-camera.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/via-camera.c
b/drivers/media/platform/via-camera.c
index b051c4a..ef10136 100644
--- a/drivers/media/platform/via-camera.c
+++ b/drivers/media/platform/via-camera.c
@@ -1284,7 +1284,8 @@ static struct video_device viacam_v4l_template = {
static bool viacam_serial_is_enabled(void)
{
- struct pci_bus *pbus = pci_find_bus(0, 0);
+ struct pci_bus *pbus = pci_get_bus(0, 0);
+ bool ret = false;
u8 cbyte;
if (!pbus)
@@ -1292,18 +1293,21 @@ static bool viacam_serial_is_enabled(void)
pci_bus_read_config_byte(pbus, VIACAM_SERIAL_DEVFN,
VIACAM_SERIAL_CREG, &cbyte);
if ((cbyte & VIACAM_SERIAL_BIT) == 0)
- return false; /* Not enabled */
+ goto out; /* Not enabled */
if (override_serial == 0) {
printk(KERN_NOTICE "Via camera: serial port is enabled, " \
"refusing to load.\n");
printk(KERN_NOTICE "Specify override_serial=1 to force " \
"module loading.\n");
- return true;
+ ret = true;
+ goto out;
}
printk(KERN_NOTICE "Via camera: overriding serial port\n");
pci_bus_write_config_byte(pbus, VIACAM_SERIAL_DEVFN,
VIACAM_SERIAL_CREG, cbyte & ~VIACAM_SERIAL_BIT);
- return false;
+out:
+ pci_bus_put(pbus);
+ return ret;
}
static struct ov7670_config sensor_cfg = {
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
