diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/22_scsi_inf_loop.patch | 21 |
2 files changed, 25 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 98c8ce1..c0afaab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ gnumach (1:20050801-4) UNRELEASED; urgency=low * Actually enable the io access disabling patch. - debian/patches/42_disable_ioperm.disabled: Rename to ... - debian/patches/42_disable_ioperm.patch: ... this. + * Check for correct return code from pcibios in de4x5 SCSI driver, which + was making it loop infinitely if probed. + - debian/patches/22_scsi_inf_loop.patch: New file. + Thanks to Samuel Thibault <samuel.thibault@ens-lyon.org>. -- Guillem Jover <guillem@debian.org> Sun, 15 Jan 2006 00:05:27 +0200 diff --git a/debian/patches/22_scsi_inf_loop.patch b/debian/patches/22_scsi_inf_loop.patch new file mode 100644 index 0000000..7f96819 --- /dev/null +++ b/debian/patches/22_scsi_inf_loop.patch @@ -0,0 +1,21 @@ +#DPATCHLEVEL=1 + +2006-01-15 Samuel Thibault <samuel.thibault@ens-lyon.org> + + Fix de4x5 PCI probe. + + * linux/src/drivers/net/de4x5.c (pci_probe): Keep probing only + while pcibios_find_class succeeds. + +--- gnumach-20050801/linux/src/drivers/net/de4x5.c 1999-04-26 07:52:00.000000000 +0200 ++++ gnumach-mine/linux/src/drivers/net/de4x5.c 2006-01-15 00:35:45.000000000 +0100 +@@ -2147,7 +2147,7 @@ pci_probe(struct device *dev, u_long ioa + } + + for (index=lastPCI+1; +- (pcibios_find_class(class, index, &pb, &dev_fn)!= PCIBIOS_DEVICE_NOT_FOUND); ++ (pcibios_find_class(class, index, &pb, &dev_fn)== PCIBIOS_SUCCESSFUL); + index++) { + dev_num = PCI_SLOT(dev_fn); + if ((!pbus && !dnum) || ((pbus == pb) && (dnum == dev_num))) { + |