---

yaml --- r: 264825 b: refs/heads/master c: 10e4ac5 h: refs/heads/master i: 264823: 3315119 v: v3
git-mirror · Sep 15, 2011 · 3e695e7 · 3e695e7
1 parent faec4ae
commit 3e695e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 129220848c733c742b92ec8e384788353d13cbeb
+refs/heads/master: 10e4ac572eeffe5317019bd7330b6058a400dfc2
diff --git 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)