redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Blackfin arch: Fix bogus str_ident check in gpio code

Browse source 
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
Michael Hennerich 2008-10-13 11:35:22 +08:00 committed by Bryan Wu
parent 46aa04f9b6
commit e9fae189ca
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/blackfin/kernel/bfin_gpio.c
View file

@ -238,7 +238,7 @@ static void gpio_error(unsigned gpio)
static void set_label(unsigned short ident, const char *label) static void set_label(unsigned short ident, const char *label)
{ {
if (label && str_ident) { if (label) {
strncpy(str_ident[ident].name, label, strncpy(str_ident[ident].name, label,
RESOURCE_LABEL_SIZE); RESOURCE_LABEL_SIZE);
str_ident[ident].name[RESOURCE_LABEL_SIZE - 1] = 0; str_ident[ident].name[RESOURCE_LABEL_SIZE - 1] = 0;
@ -247,9 +247,6 @@ static void set_label(unsigned short ident, const char *label)
static char *get_label(unsigned short ident) static char *get_label(unsigned short ident)
{ {
if (!str_ident)
return "UNKNOWN";
return (*str_ident[ident].name ? str_ident[ident].name : "UNKNOWN"); return (*str_ident[ident].name ? str_ident[ident].name : "UNKNOWN");
} }
@ -260,7 +257,7 @@ static int cmp_label(unsigned short ident, const char *label)
printk(KERN_ERR "Please provide none-null label\n"); printk(KERN_ERR "Please provide none-null label\n");
} }
if (label && str_ident) if (label)
return strncmp(str_ident[ident].name, return strncmp(str_ident[ident].name,
label, strlen(label)); label, strlen(label));
else else