Merge branch 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6-microblaze.git] / drivers / misc / altera-stapl / altera.c

diff --git a/drivers/misc/altera-stapl/altera.c b/drivers/misc/altera-stapl/altera.c
index ef83a90..d2ed3b9 100644 (file)
--- a/drivers/misc/altera-stapl/altera.c
+++ b/drivers/misc/altera-stapl/altera.c
@@ -2176,8 +2176,7 @@ static int altera_get_note(u8 *p, s32 program_size,
                        key_ptr = &p[note_strings +
                                        get_unaligned_be32(
                                        &p[note_table + (8 * i)])];
-                       if ((strncasecmp(key, key_ptr, strlen(key_ptr)) == 0) &&
-                                               (key != NULL)) {
+                       if (key && !strncasecmp(key, key_ptr, strlen(key_ptr))) {
                                status = 0;
 
                                value_ptr = &p[note_strings +