[kernel] r14392 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Wed Oct 14 03:33:20 2009
New Revision: 14392

Log:
acenic: Pass up error code from ace_load_firmware(), avoiding an oops (Closes: #521383)

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/acenic-pass-up-error-code-from-ace_load_firmware.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/20

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Wed Oct 14 03:11:43 2009	(r14391)
+++ dists/lenny/linux-2.6/debian/changelog	Wed Oct 14 03:33:20 2009	(r14392)
@@ -23,6 +23,8 @@
   * r8169: Fix rx_missed_errors statistic (Closes: #531932)
   * hfsplus: Refuse to mount volumes larger than 2TB, which may otherwise
     be corrupted (Closes: #550010)
+  * acenic: Pass up error code from ace_load_firmware(), avoiding an oops
+    (Closes: #521383)
 
   [ dann frazier ]
   * autofs4: don't make expiring dentry negative, avoiding an oops

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/acenic-pass-up-error-code-from-ace_load_firmware.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/acenic-pass-up-error-code-from-ace_load_firmware.patch	Wed Oct 14 03:33:20 2009	(r14392)
@@ -0,0 +1,32 @@
+From 6c60e0c30c80fcd53e61701b7865a85283f8a341 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 12 Oct 2009 04:18:48 -0700
+Subject: [PATCH] acenic: Pass up error code from ace_load_firmware()
+
+If ace_load_firmware() fails, ace_init() cleans up but still returns
+0, leading to an oops as seen in <http://bugs.debian.org/521383>.
+It should pass the error code up.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/acenic.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
+index 5f0b05c..d82a9a9 100644
+--- a/drivers/net/acenic.c
++++ b/drivers/net/acenic.c
+@@ -1209,7 +1209,8 @@ static int __devinit ace_init(struct net_device *dev)
+ 	memset(ap->info, 0, sizeof(struct ace_info));
+ 	memset(ap->skb, 0, sizeof(struct ace_skb));
+ 
+-	if (ace_load_firmware(dev))
++	ecode = ace_load_firmware(dev);
++	if (ecode)
+ 		goto init_error;
+ 
+ 	ap->fw_running = 0;
+-- 
+1.6.4.3
+

Modified: dists/lenny/linux-2.6/debian/patches/series/20
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/20	Wed Oct 14 03:11:43 2009	(r14391)
+++ dists/lenny/linux-2.6/debian/patches/series/20	Wed Oct 14 03:33:20 2009	(r14392)
@@ -16,4 +16,5 @@
 + bugfix/all/r8169-fix-rx_missed_errors.patch
 + bugfix/all/hfsplus-limit-to-2tb.patch
 + features/all/ftdi_sio-openrd.patch
-+ bugfix/all/nbd-fix-io-hang-on-disconnected-nbds.patch
\ No newline at end of file
++ bugfix/all/nbd-fix-io-hang-on-disconnected-nbds.patch
++ bugfix/all/acenic-pass-up-error-code-from-ace_load_firmware.patch