diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-09-13 11:08:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-09-13 11:09:04 +0200 |
| commit | 76bf6877fed4f59826a72e0ab209badfc594008a (patch) | |
| tree | 3e66280e0579c716991fb7cd67d771d0b8766358 /drivers/media/video/via-camera.c | |
| parent | 0fa914c632210e09940f0bf5b85d2329b75e04e0 (diff) | |
| parent | b6fd41e29dea9c6753b1843a77e50433e6123bcb (diff) | |
Merge commit 'v3.1-rc6' into core/locking
Merge reason: We are queueing up locking annotation patches, move to a fresh base
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/via-camera.c')
| -rw-r--r-- | drivers/media/video/via-camera.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c index 85d3048c1d67..bb7f17f2a33c 100644 --- a/drivers/media/video/via-camera.c +++ b/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) |