aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Huewe <PeterHuewe@gmx.de>2011-01-25 15:38:52 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 19:32:16 -0400
commitf72cfd859b0e436d9f680790cb665ad1390187ae (patch)
treee03c794ae5ea5451a621e8516b7826846927a76d
parent9bd060e492a2725c55404988ceed473a090bd04d (diff)
[media] video/cx231xx: Fix sparse warning: Using plain integer as NULL pointer
This patch fixes the warning "Using plain integer as NULL pointer", generated by sparse, by replacing the offending 0s with NULL. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Reviewed-by: Devin Heitmueller <dheitmueller@hauppauge.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx231xx/cx231xx-417.c4
-rw-r--r--drivers/media/video/cx231xx/cx231xx-cards.c16
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-417.c b/drivers/media/video/cx231xx/cx231xx-417.c
index fc9526a5b746..f8f0e59cd583 100644
--- a/drivers/media/video/cx231xx/cx231xx-417.c
+++ b/drivers/media/video/cx231xx/cx231xx-417.c
@@ -942,13 +942,13 @@ static int cx231xx_load_firmware(struct cx231xx *dev)
942 942
943 p_current_fw = vmalloc(1884180 * 4); 943 p_current_fw = vmalloc(1884180 * 4);
944 p_fw = p_current_fw; 944 p_fw = p_current_fw;
945 if (p_current_fw == 0) { 945 if (p_current_fw == NULL) {
946 dprintk(2, "FAIL!!!\n"); 946 dprintk(2, "FAIL!!!\n");
947 return -1; 947 return -1;
948 } 948 }
949 949
950 p_buffer = vmalloc(4096); 950 p_buffer = vmalloc(4096);
951 if (p_buffer == 0) { 951 if (p_buffer == NULL) {
952 dprintk(2, "FAIL!!!\n"); 952 dprintk(2, "FAIL!!!\n");
953 return -1; 953 return -1;
954 } 954 }
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index 6540b8dfb6bb..f49230d170e6 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -360,19 +360,19 @@ struct cx231xx_board cx231xx_boards[] = {
360 .type = CX231XX_VMUX_TELEVISION, 360 .type = CX231XX_VMUX_TELEVISION,
361 .vmux = CX231XX_VIN_3_1, 361 .vmux = CX231XX_VIN_3_1,
362 .amux = CX231XX_AMUX_VIDEO, 362 .amux = CX231XX_AMUX_VIDEO,
363 .gpio = 0, 363 .gpio = NULL,
364 }, { 364 }, {
365 .type = CX231XX_VMUX_COMPOSITE1, 365 .type = CX231XX_VMUX_COMPOSITE1,
366 .vmux = CX231XX_VIN_2_1, 366 .vmux = CX231XX_VIN_2_1,
367 .amux = CX231XX_AMUX_LINE_IN, 367 .amux = CX231XX_AMUX_LINE_IN,
368 .gpio = 0, 368 .gpio = NULL,
369 }, { 369 }, {
370 .type = CX231XX_VMUX_SVIDEO, 370 .type = CX231XX_VMUX_SVIDEO,
371 .vmux = CX231XX_VIN_1_1 | 371 .vmux = CX231XX_VIN_1_1 |
372 (CX231XX_VIN_1_2 << 8) | 372 (CX231XX_VIN_1_2 << 8) |
373 CX25840_SVIDEO_ON, 373 CX25840_SVIDEO_ON,
374 .amux = CX231XX_AMUX_LINE_IN, 374 .amux = CX231XX_AMUX_LINE_IN,
375 .gpio = 0, 375 .gpio = NULL,
376 } }, 376 } },
377 }, 377 },
378 [CX231XX_BOARD_HAUPPAUGE_USBLIVE2] = { 378 [CX231XX_BOARD_HAUPPAUGE_USBLIVE2] = {
@@ -391,14 +391,14 @@ struct cx231xx_board cx231xx_boards[] = {
391 .type = CX231XX_VMUX_COMPOSITE1, 391 .type = CX231XX_VMUX_COMPOSITE1,
392 .vmux = CX231XX_VIN_2_1, 392 .vmux = CX231XX_VIN_2_1,
393 .amux = CX231XX_AMUX_LINE_IN, 393 .amux = CX231XX_AMUX_LINE_IN,
394 .gpio = 0, 394 .gpio = NULL,
395 }, { 395 }, {
396 .type = CX231XX_VMUX_SVIDEO, 396 .type = CX231XX_VMUX_SVIDEO,
397 .vmux = CX231XX_VIN_1_1 | 397 .vmux = CX231XX_VIN_1_1 |
398 (CX231XX_VIN_1_2 << 8) | 398 (CX231XX_VIN_1_2 << 8) |
399 CX25840_SVIDEO_ON, 399 CX25840_SVIDEO_ON,
400 .amux = CX231XX_AMUX_LINE_IN, 400 .amux = CX231XX_AMUX_LINE_IN,
401 .gpio = 0, 401 .gpio = NULL,
402 } }, 402 } },
403 }, 403 },
404 [CX231XX_BOARD_PV_PLAYTV_USB_HYBRID] = { 404 [CX231XX_BOARD_PV_PLAYTV_USB_HYBRID] = {
@@ -425,19 +425,19 @@ struct cx231xx_board cx231xx_boards[] = {
425 .type = CX231XX_VMUX_TELEVISION, 425 .type = CX231XX_VMUX_TELEVISION,
426 .vmux = CX231XX_VIN_3_1, 426 .vmux = CX231XX_VIN_3_1,
427 .amux = CX231XX_AMUX_VIDEO, 427 .amux = CX231XX_AMUX_VIDEO,
428 .gpio = 0, 428 .gpio = NULL,
429 }, { 429 }, {
430 .type = CX231XX_VMUX_COMPOSITE1, 430 .type = CX231XX_VMUX_COMPOSITE1,
431 .vmux = CX231XX_VIN_2_1, 431 .vmux = CX231XX_VIN_2_1,
432 .amux = CX231XX_AMUX_LINE_IN, 432 .amux = CX231XX_AMUX_LINE_IN,
433 .gpio = 0, 433 .gpio = NULL,
434 }, { 434 }, {
435 .type = CX231XX_VMUX_SVIDEO, 435 .type = CX231XX_VMUX_SVIDEO,
436 .vmux = CX231XX_VIN_1_1 | 436 .vmux = CX231XX_VIN_1_1 |
437 (CX231XX_VIN_1_2 << 8) | 437 (CX231XX_VIN_1_2 << 8) |
438 CX25840_SVIDEO_ON, 438 CX25840_SVIDEO_ON,
439 .amux = CX231XX_AMUX_LINE_IN, 439 .amux = CX231XX_AMUX_LINE_IN,
440 .gpio = 0, 440 .gpio = NULL,
441 } }, 441 } },
442 }, 442 },
443 [CX231XX_BOARD_PV_XCAPTURE_USB] = { 443 [CX231XX_BOARD_PV_XCAPTURE_USB] = {