r2128 - trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches

[Andres Salomon]

Author: dilinger-guest
Date: 2005-01-05 06:07:07 +0100 (Wed, 05 Jan 2005)
New Revision: 2128

Modified:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/007-pci_ide_no_reserve.dpatch
Log:
Damn you, modular-ide.dpatch!


Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/007-pci_ide_no_reserve.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/007-pci_ide_no_reserve.dpatch	2005-01-05 04:48:30 UTC (rev 2127)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/007-pci_ide_no_reserve.dpatch	2005-01-05 05:07:07 UTC (rev 2128)
@@ -33,7 +33,7 @@
 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 @@
+@@ -96,27 +96,29 @@
  {
  	ide_pci_device_t *d = &generic_chipsets[id->driver_data];
  	u16 command;
@@ -60,6 +60,8 @@
 +		goto out;
  	}
 +	ret = 0;
+ 	if (!try_module_get(THIS_MODULE))
+ 		return -ENODEV;
  	ide_setup_pci_device(dev, d);
 -	return 0;
 +out: