]> git.karo-electronics.de Git - karo-tx-linux.git/commit
e1000: fix return value not set on error
authorDean Nelson <dnelson@redhat.com>
Thu, 11 Nov 2010 05:50:25 +0000 (05:50 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 23:14:01 +0000 (15:14 -0800)
commiteb9a2a905602b02474d257c4a26c90a8dc36c70c
tree4d134f72c83386a62c0ca178e914b663ff8417f1
parent8d4a7d18aae3ebb8f08d237d31dc83229d2322df
e1000: fix return value not set on error

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