Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb6969e8 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

misc: fix integer as NULL pointer warnings 



drivers/md/raid10.c:889:17: warning: Using plain integer as NULL pointer
drivers/media/video/cx18/cx18-driver.c:616:12: warning: Using plain integer as NULL pointer
sound/oss/kahlua.c:70:12: warning: Using plain integer as NULL pointer

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Neil Brown <neilb@suse.de>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8594303a

drivers/md/raid10.c

+1 −1
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ static int make_request(struct request_queue *q, struct bio * bio) 
	 */

	raid10_find_phys(conf, r10_bio);

 retry_write:

	blocked_rdev = 0;

	blocked_rdev = NULL;

	rcu_read_lock();

	for (i = 0;  i < conf->copies; i++) {

		int d = r10_bio->devs[i].devnum;

drivers/media/video/cx18/cx18-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ static int __devinit cx18_probe(struct pci_dev *dev, 
	}



	cx = kzalloc(sizeof(struct cx18), GFP_ATOMIC);

	if (cx == 0) {

	if (!cx) {

		spin_unlock(&cx18_cards_lock);

		return -ENOMEM;

	}

sound/oss/kahlua.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id 
		return 1;

	

	mem = ioremap(base, 128);

	if(mem == 0UL)

	if (!mem)

		return 1;

	map = readw(mem + 0x18);	/* Read the SMI enables */

	iounmap(mem);