diff options
Diffstat (limited to 'drivers/media/video/saa7114.c')
-rw-r--r-- | drivers/media/video/saa7114.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c index 1ca4e70fed76..2ba997f5ef1d 100644 --- a/drivers/media/video/saa7114.c +++ b/drivers/media/video/saa7114.c | |||
@@ -821,15 +821,13 @@ saa7114_command (struct i2c_client *client, | |||
821 | static unsigned short normal_i2c[] = | 821 | static unsigned short normal_i2c[] = |
822 | { I2C_SAA7114 >> 1, I2C_SAA7114A >> 1, I2C_CLIENT_END }; | 822 | { I2C_SAA7114 >> 1, I2C_SAA7114A >> 1, I2C_CLIENT_END }; |
823 | 823 | ||
824 | static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; | 824 | static unsigned short ignore = I2C_CLIENT_END; |
825 | static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; | ||
826 | static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END }; | ||
827 | 825 | ||
828 | static struct i2c_client_address_data addr_data = { | 826 | static struct i2c_client_address_data addr_data = { |
829 | .normal_i2c = normal_i2c, | 827 | .normal_i2c = normal_i2c, |
830 | .probe = probe, | 828 | .probe = &ignore, |
831 | .ignore = ignore, | 829 | .ignore = &ignore, |
832 | .force = force | 830 | .force = &ignore, |
833 | }; | 831 | }; |
834 | 832 | ||
835 | static struct i2c_driver i2c_driver_saa7114; | 833 | static struct i2c_driver i2c_driver_saa7114; |