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

Commit b2111217 authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

isapnp: remove pointless check of 'type' against 0 in isapnp_read_tag() 



In drivers/pnp/isapnp/core.c::isapnp_read_tag() there is a test of 'type'
being == 0 a bit down in the function.  That test doesn't make any sense.
If 'type' could indeed be NULL, then the test happens way too late as we'd
already have tried to dereference the pointer earlier and looking at the
callers it also turns out that there is no way type can ever actually be
NULL.

So the test is completely pointless and should just be removed.

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3f1b0e1f

drivers/pnp/isapnp/core.c

+0 −2
Original line number Diff line number Diff line
@@ -370,8 +370,6 @@ static int __init isapnp_read_tag(unsigned char *type, unsigned short *size) 
#if 0

	printk(KERN_DEBUG "tag = 0x%x, type = 0x%x, size = %i\n", tag, *type, *size);

#endif

	if (type == 0)				/* wrong type */

		return -1;

	if (*type == 0xff && *size == 0xffff)	/* probably invalid data */

		return -1;

	return 0;