Messages in this thread | | | Subject | Re: [PATCH] net: ethernet: toshiba: ps3_gelic_net.c: Cleaning up a check on a memory allocation | From | Geoff Levand <> | Date | Mon, 09 Jun 2014 16:21:10 -0700 |
| |
Hi,
On Sat, 2014-06-07 at 12:22 +0200, Rickard Strandqvist wrote: > A check on a memory allocation is checked incorrectly. > > This was partly found using a static code analysis program called cppcheck. > > Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> > --- > drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c > index d899d00..bb79928 100644 > --- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c > +++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c > @@ -1561,7 +1561,7 @@ static struct gelic_card *gelic_alloc_card_net(struct net_device **netdev) > * alloc netdev > */ > *netdev = alloc_etherdev(sizeof(struct gelic_port)); > - if (!netdev) { > + if (!*netdev) { > kfree(card->unalign); > return NULL; > }
Looks good, thanks for posting.
Dave, please queue for merge upstream.
Acked-by: Geoff Levand <geoff@infradead.org>
| |