diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-13 10:17:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-13 10:17:10 +0100 |
| commit | af40d16042d674442db8cf5fd654fabcd45fea44 (patch) | |
| tree | 56f80d083a4a7236a0ee7914ef2baa8222d65494 /drivers/net/dsa/ocelot/felix.c | |
| parent | binder: fix pointer cast warning (diff) | |
| parent | Linux 5.16-rc5 (diff) | |
| download | linux-dev-af40d16042d674442db8cf5fd654fabcd45fea44.tar.xz linux-dev-af40d16042d674442db8cf5fd654fabcd45fea44.zip | |
Merge v5.15-rc5 into char-misc-next
We need the fixes in here as well, and also resolve some merge conflicts
in:
drivers/misc/eeprom/at25.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/dsa/ocelot/felix.c')
| -rw-r--r-- | drivers/net/dsa/ocelot/felix.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c index 327cc4654806..f1a05e7dc818 100644 --- a/drivers/net/dsa/ocelot/felix.c +++ b/drivers/net/dsa/ocelot/felix.c @@ -290,8 +290,11 @@ static int felix_setup_mmio_filtering(struct felix *felix) } } - if (cpu < 0) + if (cpu < 0) { + kfree(tagging_rule); + kfree(redirect_rule); return -EINVAL; + } tagging_rule->key_type = OCELOT_VCAP_KEY_ETYPE; *(__be16 *)tagging_rule->key.etype.etype.value = htons(ETH_P_1588); |