Message ID | 5685B8AD.7010900@users.sourceforge.net |
---|---|
State | Rejected, archived |
Delegated to: | David Miller |
Headers | show |
On Fri, Jan 1, 2016 at 4:52 AM, SF Markus Elfring <elfring@users.sourceforge.net> wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Fri, 1 Jan 2016 00:11:57 +0100 > > Remove two checks for null pointers which would be handled by usual > error detection before. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Acked-by: Sathya Perla <sathya.perla@avagotech.com> This patch is suitable for the net-next tree. Thanks! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c index b63d8ad..ba98297 100644 --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c @@ -4366,9 +4366,7 @@ int be_cmd_get_profile_config(struct be_adapter *adapter, if (vf_res) res->vf_if_cap_flags = vf_res->cap_flags; err: - if (cmd.va) - dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va, - cmd.dma); + dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va, cmd.dma); return status; } @@ -4398,10 +4396,7 @@ static int be_cmd_set_profile_config(struct be_adapter *adapter, void *desc, memcpy(req->desc, desc, size); status = be_cmd_notify_wait(adapter, &wrb); - - if (cmd.va) - dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va, - cmd.dma); + dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va, cmd.dma); return status; }