Skip to content

Commit

Permalink
[IA64] Fix pcibios_setup
Browse files Browse the repository at this point in the history
pcibios_setup() should return NULL if it handled a parameter.  Since ia64
handles no parameters, it should return the string that was passed in,
not NULL.  This brings ia64 into line with all other architectures that
handle no parameters.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
Matthew Wilcox authored and Tony Luck committed Feb 27, 2006
1 parent 18810d1 commit ac311ac
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/ia64/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ pcibios_align_resource (void *data, struct resource *res,
char * __init
pcibios_setup (char *str)
{
return NULL;
return str;
}

int
Expand Down

0 comments on commit ac311ac

Please sign in to comment.