summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/dpc7146.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/dpc7146.c')
-rw-r--r--linux/drivers/media/video/dpc7146.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/video/dpc7146.c b/linux/drivers/media/video/dpc7146.c
index 2d0b45e9a..ee2eb280f 100644
--- a/linux/drivers/media/video/dpc7146.c
+++ b/linux/drivers/media/video/dpc7146.c
@@ -19,8 +19,8 @@
*/
#define DEBUG_VARIABLE debug
-#include "saa7146_vv.h"
+#include <media/saa7146_vv.h>
#include <linux/video_decoder.h> /* for saa7111a */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
@@ -117,7 +117,10 @@ static int dpc_probe(struct saa7146_dev* dev)
}
/* loop through all i2c-devices on the bus and look who is there */
- for(i = 0; i < dpc->i2c_adapter.client_count; i++) {
+ for(i = 0; i < I2C_CLIENT_MAX; i++) {
+ if( NULL == dpc->i2c_adapter.clients[i] ) {
+ continue;
+ }
if( I2C_SAA7111A == dpc->i2c_adapter.clients[i]->addr )
dpc->saa7111a = dpc->i2c_adapter.clients[i];
}