summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7127.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/saa7127.c')
-rw-r--r--linux/drivers/media/video/saa7127.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7127.c b/linux/drivers/media/video/saa7127.c
index 7b146fbb9..ca88dd325 100644
--- a/linux/drivers/media/video/saa7127.c
+++ b/linux/drivers/media/video/saa7127.c
@@ -719,9 +719,12 @@ static int saa7127_probe(struct i2c_client *client,
saa7127_set_input_type(client, SAA7127_INPUT_TYPE_NORMAL);
saa7127_set_video_enable(client, 1);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
if (id->driver_data) { /* Chip type is already known */
state->ident = id->driver_data;
- } else { /* Needs detection */
+ } else /* Needs detection */
+#endif
+ {
int read_result;
/* Detect if it's an saa7129 */