e1000: fix return value not set on error
authorDean Nelson <dnelson@redhat.com>
Thu, 11 Nov 2010 05:50:25 +0000 (05:50 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sat, 11 Dec 2010 06:12:29 +0000 (22:12 -0800)
commit19a0b67afd174c4db261d587b5c67704dcd53c17
tree05ac966305d5e51f486f949e56e4131c892a690c
parentfa795e6b9c59a14c80a475428df7e4cb97396f47
e1000: fix return value not set on error

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.

CC: stable@kernel.org
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>
drivers/net/e1000/e1000_main.c