From 3e695e7ef7103f22d04e2cfda114835d31d0053f Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 1 Aug 2011 23:39:17 +0200 Subject: [PATCH] --- yaml --- r: 264825 b: refs/heads/master c: 10e4ac572eeffe5317019bd7330b6058a400dfc2 h: refs/heads/master i: 264823: 3315119e386b037a161bcc78ecc8920cf1f1b8eb 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 e5eaddd14397..8fe141687ded 100644 --- 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 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)