lkml.org 
[lkml]   [2011]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[079/272] e1000: fix return value not set on error
    2.6.37-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Dean Nelson <dnelson@redhat.com>

    commit 19a0b67afd174c4db261d587b5c67704dcd53c17 upstream.

    Dean noticed that 'err' wasn't being set when the "goto err_dma"
    statement is executed in the following hunk from the commit. It's value
    will be zero as a result of a successful call to e1000_init_hw_struct().

    This patch changes the error condition to be correctly propagated.

    Signed-off-by: Dean Nelson <dnelson@redhat.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/e1000/e1000_main.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    --- a/drivers/net/e1000/e1000_main.c
    +++ b/drivers/net/e1000/e1000_main.c
    @@ -971,11 +971,13 @@ static int __devinit e1000_probe(struct
    */
    dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
    pci_using_dac = 1;
    - } else if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {
    - dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
    } else {
    - pr_err("No usable DMA config, aborting\n");
    - goto err_dma;
    + err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
    + if (err) {
    + pr_err("No usable DMA config, aborting\n");
    + goto err_dma;
    + }
    + dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
    }

    netdev->netdev_ops = &e1000_netdev_ops;



    \
     
     \ /
      Last update: 2011-02-16 02:41    [W:2.254 / U:0.484 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site