Merge branch 'master' into upstream.

[pandora-kernel.git] / drivers / media / video / cx231xx / cx231xx-417.c

diff --git a/drivers/media/video/cx231xx/cx231xx-417.c b/drivers/media/video/cx231xx/cx231xx-417.c
index fc9526a..f8f0e59 100644 (file)
--- 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)
 
        p_current_fw = vmalloc(1884180 * 4);
        p_fw = p_current_fw;
-       if (p_current_fw == 0) {
+       if (p_current_fw == NULL) {
                dprintk(2, "FAIL!!!\n");
                return -1;
        }
 
        p_buffer = vmalloc(4096);
-       if (p_buffer == 0) {
+       if (p_buffer == NULL) {
                dprintk(2, "FAIL!!!\n");
                return -1;
        }