r2255 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches: . series

[Christoph Hellwig]

Author: hch-guest
Date: 2005-01-10 10:44:12 +0100 (Mon, 10 Jan 2005)
New Revision: 2255

Added:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/007-pci_ide_no_reserve-2.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4
Log:

fix the modular ide rework, some later applied patch had changed contexts



Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/007-pci_ide_no_reserve-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/007-pci_ide_no_reserve-2.dpatch	2005-01-10 08:00:42 UTC (rev 2254)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/007-pci_ide_no_reserve-2.dpatch	2005-01-10 09:44:12 UTC (rev 2255)
@@ -0,0 +1,69 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [ide] fix return codes in the generic PCI IDE driver
+## DP: Patch author: bzolnier@trik.(none)
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/12/30 19:07:00+01:00 bzolnier@trik.(none) 
+#   [ide] fix return codes in the generic PCI IDE driver
+#   
+#   From: Alan Cox <alan@redhat.com>
+#   
+#   This patch updates ide/pci/generic.c to fix the incorrect returns
+#   causing PCI devices to be left reserved wrongly by the driver.
+#   
+#   From: Francois Romieu <romieu@fr.zoreil.com>
+#   
+#   Use -ENODEV instead of -EAGAIN.
+#   
+#   Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
+# 
+# drivers/ide/pci/generic.c
+#   2004/12/30 19:06:50+01:00 bzolnier@trik.(none) +8 -6
+#   [ide] fix return codes in the generic PCI IDE driver
+# 
+diff -Nru a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
+--- a/drivers/ide/pci/generic.c	2005-01-04 18:06:08 -08:00
++++ b/drivers/ide/pci/generic.c	2005-01-04 18:06:08 -08:00
+@@ -96,25 +96,27 @@
+ {
+ 	ide_pci_device_t *d = &generic_chipsets[id->driver_data];
+ 	u16 command;
++	int ret = -ENODEV;
+ 
+ 	if (dev->vendor == PCI_VENDOR_ID_UMC &&
+ 	    dev->device == PCI_DEVICE_ID_UMC_UM8886A &&
+ 	    (!(PCI_FUNC(dev->devfn) & 1)))
+-		return 1; /* UM8886A/BF pair */
++		goto out; /* UM8886A/BF pair */
+ 
+ 	if (dev->vendor == PCI_VENDOR_ID_OPTI &&
+ 	    dev->device == PCI_DEVICE_ID_OPTI_82C558 &&
+ 	    (!(PCI_FUNC(dev->devfn) & 1)))
+-		return 1;
++		goto out;
+ 
+ 	pci_read_config_word(dev, PCI_COMMAND, &command);
+-	if(!(command & PCI_COMMAND_IO))
+-	{
++	if (!(command & PCI_COMMAND_IO)) {
+ 		printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name);
+-		return 1; 
++		goto out;
+ 	}
++	ret = 0;
+ 	ide_setup_pci_device(dev, d);
+-	return 0;
++out:
++	return ret;
+ }
+ 
+ static struct pci_device_id generic_pci_tbl[] = {

Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4	2005-01-10 08:00:42 UTC (rev 2254)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4	2005-01-10 09:44:12 UTC (rev 2255)
@@ -1,8 +1,10 @@
 - smbfs-overflow-fixes.dpatch
 + smbfs-overflow-fixes-2.dpatch
+- 007-pci_ide_no_reserve.dpatch
 - modular-ide.dpatch
 + modular-ide-2.dpatch
 + drivers-ide-__devinit.dpatch
++ 007-pci_ide_no_reserve-2.dpatch
 - alsa-module-load-fix.dpatch
 - drivers-input-psaux-hacks.dpatch
 + fix-mxser-compile.dpatch