From a296d512b02023224eebaf47ab7b82532fec9362 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 1 Aug 2011 18:39:17 -0300 Subject: [PATCH] --- yaml --- r: 263724 b: refs/heads/master c: c8814df3a578895390fe5c05a76328d8d111ed25 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/via-camera.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1cc61ab70aa2..ca14ac90a8ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a02a3306769c6f0fa8ebd92d5046c841e4e740d +refs/heads/master: c8814df3a578895390fe5c05a76328d8d111ed25 diff --git a/trunk/drivers/media/video/via-camera.c b/trunk/drivers/media/video/via-camera.c index 85d3048c1d67..bb7f17f2a33c 100644 --- a/trunk/drivers/media/video/via-camera.c +++ b/trunk/drivers/media/video/via-camera.c @@ -1332,6 +1332,8 @@ static __devinit bool viacam_serial_is_enabled(void) struct pci_bus *pbus = pci_find_bus(0, 0); u8 cbyte; + if (!pbus) + return false; pci_bus_read_config_byte(pbus, VIACAM_SERIAL_DEVFN, VIACAM_SERIAL_CREG, &cbyte); if ((cbyte & VIACAM_SERIAL_BIT) == 0)