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)