r1564 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Christoph Hellwig]

Author: hch-guest
Date: 2004-09-06 12:58:39 -0600 (Mon, 06 Sep 2004)
New Revision: 1564

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/aic79xx-nohw.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6
Log:

  * Handle loaded but no hardware present properly in aic79xx (closes: 270102)
    (Christoph Hellwig).



Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-09-05 21:31:07 UTC (rev 1563)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-09-06 18:58:39 UTC (rev 1564)
@@ -26,6 +26,9 @@
 
   * Make sure SCSI disk caches are flushed on shutdown (Christoph Hellwig).
 
+  * Handle loaded but no hardware present properly in aic79xx (closes: 270102)
+    (Christoph Hellwig).
+
  -- Sven Luther <luther@debian.org>  Tue, 31 Aug 2004 11:29:36 +0200
 
 kernel-source-2.6.8 (2.6.8-5) unstable; urgency=high

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/aic79xx-nohw.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/aic79xx-nohw.dpatch	2004-09-05 21:31:07 UTC (rev 1563)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/aic79xx-nohw.dpatch	2004-09-06 18:58:39 UTC (rev 1564)
@@ -0,0 +1,50 @@
+#! /bin/sh -e 
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Handle loaded but no hardware present properly in aic79xx
+## DP: Patch author: Christoph Hellwig <hch@lst.de>
+## DP: Upstream status: submitted
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- 1.56/drivers/scsi/aic7xxx/aic79xx_osm.c	2004-08-25 01:09:04 +02:00
++++ edited/drivers/scsi/aic7xxx/aic79xx_osm.c	2004-09-06 20:46:53 +02:00
+@@ -851,6 +851,7 @@
+ {
+ 	struct	ahd_softc *ahd;
+ 	int     found;
++	int	error = 0;
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 	/*
+@@ -902,7 +903,9 @@
+ 	ahd_list_lockinit();
+ 
+ #ifdef CONFIG_PCI
+-	ahd_linux_pci_init();
++	error = ahd_linux_pci_init();
++	if (error)
++		return error;
+ #endif
+ 
+ 	/*
+@@ -919,7 +922,7 @@
+ 	spin_lock_irq(&io_request_lock);
+ #endif
+ 	aic79xx_detect_complete++;
+-	return (found);
++	return 0;
+ }
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+@@ -5073,7 +5076,7 @@
+ ahd_linux_init(void)
+ {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+-       return (ahd_linux_detect(&aic79xx_driver_template) ? 0 : -ENODEV);
++	return ahd_linux_detect(&aic79xx_driver_template);
+ #else
+ 	scsi_register_module(MODULE_SCSI_HA, &aic79xx_driver_template);
+ 	if (aic79xx_driver_template.present == 0) {

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6	2004-09-05 21:31:07 UTC (rev 1563)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6	2004-09-06 18:58:39 UTC (rev 1564)
@@ -11,3 +11,4 @@
 + powerpc-cmdline.dpatch
 + capi-freeing-fix.dpatch
 + scsi-shutdown-fix.dpatch
++ aic79xx-nohw.dpatch