aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/zc3xx.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-07-05 05:12:47 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:17:11 -0400
commitefab8211db79d20032fa7d09b8a3671e68a9c5b9 (patch)
tree34ca0e9e7ab193355ad3fd8229585481a50d226e /drivers/media/video/gspca/zc3xx.c
parent46ccdafa71c1c95de002ce7a31e700cf5c8195df (diff)
V4L/DVB (8199): gspca: Compile warnings about NULL ptr.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/gspca/zc3xx.c')
-rw-r--r--drivers/media/video/gspca/zc3xx.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index 878344e4d2ec..63dd8916d6b6 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -6425,11 +6425,11 @@ static void setcontrast(struct gspca_dev *gspca_dev)
6425 {0x18, 0x20, 0x20, 0x1c, 0x16, 0x13, 0x10, 0x0e, 6425 {0x18, 0x20, 0x20, 0x1c, 0x16, 0x13, 0x10, 0x0e,
6426 0x0b, 0x09, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01}; 6426 0x0b, 0x09, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01};
6427 static const __u8 *gamma_tb[] = { 6427 static const __u8 *gamma_tb[] = {
6428 0, Tgamma_1, Tgamma_2, 6428 NULL, Tgamma_1, Tgamma_2,
6429 Tgamma_3, Tgamma_4, Tgamma_5, Tgamma_6 6429 Tgamma_3, Tgamma_4, Tgamma_5, Tgamma_6
6430 }; 6430 };
6431 static const __u8 *gradient_tb[] = { 6431 static const __u8 *gradient_tb[] = {
6432 0, Tgradient_1, Tgradient_2, 6432 NULL, Tgradient_1, Tgradient_2,
6433 Tgradient_3, Tgradient_4, Tgradient_5, Tgradient_6 6433 Tgradient_3, Tgradient_4, Tgradient_5, Tgradient_6
6434 }; 6434 };
6435#ifdef CONFIG_VIDEO_ADV_DEBUG 6435#ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -6544,21 +6544,21 @@ static int setlightfreq(struct gspca_dev *gspca_dev)
6544 gc0305_50HZ, gc0305_50HZ, 6544 gc0305_50HZ, gc0305_50HZ,
6545 gc0305_60HZ, gc0305_60HZ}, 6545 gc0305_60HZ, gc0305_60HZ},
6546/* SENSOR_HDCS2020 3 */ 6546/* SENSOR_HDCS2020 3 */
6547 {0, 0, 6547 {NULL, NULL,
6548 0, 0, 6548 NULL, NULL,
6549 0, 0}, 6549 NULL, NULL},
6550/* SENSOR_HDCS2020b 4 */ 6550/* SENSOR_HDCS2020b 4 */
6551 {hdcs2020b_NoFliker, hdcs2020b_NoFliker, 6551 {hdcs2020b_NoFliker, hdcs2020b_NoFliker,
6552 hdcs2020b_50HZ, hdcs2020b_50HZ, 6552 hdcs2020b_50HZ, hdcs2020b_50HZ,
6553 hdcs2020b_60HZ, hdcs2020b_60HZ}, 6553 hdcs2020b_60HZ, hdcs2020b_60HZ},
6554/* SENSOR_HV7131B 5 */ 6554/* SENSOR_HV7131B 5 */
6555 {0, 0, 6555 {NULL, NULL,
6556 0, 0, 6556 NULL, NULL,
6557 0, 0}, 6557 NULL, NULL},
6558/* SENSOR_HV7131C 6 */ 6558/* SENSOR_HV7131C 6 */
6559 {0, 0, 6559 {NULL, NULL,
6560 0, 0, 6560 NULL, NULL,
6561 0, 0}, 6561 NULL, NULL},
6562/* SENSOR_ICM105A 7 */ 6562/* SENSOR_ICM105A 7 */
6563 {icm105a_NoFliker, icm105a_NoFlikerScale, 6563 {icm105a_NoFliker, icm105a_NoFlikerScale,
6564 icm105a_50HZ, icm105a_50HZScale, 6564 icm105a_50HZ, icm105a_50HZScale,
@@ -6572,9 +6572,9 @@ static int setlightfreq(struct gspca_dev *gspca_dev)
6572 OV7620_50HZ, OV7620_50HZ, 6572 OV7620_50HZ, OV7620_50HZ,
6573 OV7620_60HZ, OV7620_60HZ}, 6573 OV7620_60HZ, OV7620_60HZ},
6574/* SENSOR_OV7630C 10 */ 6574/* SENSOR_OV7630C 10 */
6575 {0, 0, 6575 {NULL, NULL,
6576 0, 0, 6576 NULL, NULL,
6577 0, 0}, 6577 NULL, NULL},
6578/* SENSOR_PAS106 11 */ 6578/* SENSOR_PAS106 11 */
6579 {pas106b_NoFliker, pas106b_NoFliker, 6579 {pas106b_NoFliker, pas106b_NoFliker,
6580 pas106b_50HZ, pas106b_50HZ, 6580 pas106b_50HZ, pas106b_50HZ,
@@ -6606,7 +6606,7 @@ static int setlightfreq(struct gspca_dev *gspca_dev)
6606 if (!mode) 6606 if (!mode)
6607 i++; /* 640x480 */ 6607 i++; /* 640x480 */
6608 zc3_freq = freq_tb[(int) sd->sensor][i]; 6608 zc3_freq = freq_tb[(int) sd->sensor][i];
6609 if (zc3_freq != 0) { 6609 if (zc3_freq != NULL) {
6610 usb_exchange(gspca_dev->dev, zc3_freq); 6610 usb_exchange(gspca_dev->dev, zc3_freq);
6611 switch (sd->sensor) { 6611 switch (sd->sensor) {
6612 case SENSOR_GC0305: 6612 case SENSOR_GC0305: