vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge mainline into ofwfb

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-02-06 15:54:01 +01:00
commit e190e3d2cc
63 changed files with 7613 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kern/ieee1275/openfw.c
View file

@ -152,7 +152,7 @@ grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
/* Find the first property. */
aliasname[0] = '\0';
while (grub_ieee1275_next_property (aliases, aliasname, aliasname))
while (grub_ieee1275_next_property (aliases, aliasname, aliasname) > 0)
{
grub_ieee1275_phandle_t dev;
grub_ssize_t pathlen;
@ -391,7 +391,7 @@ grub_ieee1275_encode_devname (const char *path)
char *partition = grub_ieee1275_parse_args (path, GRUB_PARSE_PARTITION);
char *encoding;
if (partition)
if (partition && partition[0])
{
unsigned int partno = grub_strtoul (partition, 0, 0);