Merge branch 'kvm-amd-pmu-fixes' into HEAD

[linux-2.6-microblaze.git] / drivers / net / dsa / ocelot / felix_vsc9959.c

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 62d52e0..52a8566 100644 (file)
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -1928,6 +1928,10 @@ static int vsc9959_psfp_filter_add(struct ocelot *ocelot, int port,
                case FLOW_ACTION_GATE:
                        size = struct_size(sgi, entries, a->gate.num_entries);
                        sgi = kzalloc(size, GFP_KERNEL);
+                       if (!sgi) {
+                               ret = -ENOMEM;
+                               goto err;
+                       }
                        vsc9959_psfp_parse_gate(a, sgi);
                        ret = vsc9959_psfp_sgi_table_add(ocelot, sgi);
                        if (ret) {
@@ -2312,7 +2316,7 @@ static int felix_pci_probe(struct pci_dev *pdev,
 
        err = dsa_register_switch(ds);
        if (err) {
-               dev_err(&pdev->dev, "Failed to register DSA switch: %d\n", err);
+               dev_err_probe(&pdev->dev, err, "Failed to register DSA switch\n");
                goto err_register_ds;
        }