Commit d049bde6 authored by Greg Kurz's avatar Greg Kurz Committed by David Gibson
Browse files

spapr_pci: drop useless check in spapr_populate_pci_child_dt() 



spapr_phb_get_loc_code() either returns a non-null pointer, or aborts
if g_strdup_printf() failed to allocate memory.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
[dwg: Grammatical fix to commit message]
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 8f687605

hw/ppc/spapr_pci.c

+1 −5
Original line number Diff line number Diff line
@@ -1282,12 +1282,8 @@ static int spapr_populate_pci_child_dt(PCIDevice *dev, void *fdt, int offset, 
                            pci_find_device_name((ccode >> 16) & 0xff,

                                                 (ccode >> 8) & 0xff,

                                                 ccode & 0xff)));

    buf = spapr_phb_get_loc_code(sphb, dev);

    if (!buf) {

        error_report("Failed setting the ibm,loc-code");

        return -1;

    }



    buf = spapr_phb_get_loc_code(sphb, dev);

    err = fdt_setprop_string(fdt, offset, "ibm,loc-code", buf);

    g_free(buf);

    if (err < 0) {