diff options
| author | Jurij Smakov <jurij@wooyd.org> | 2006-12-03 23:36:58 +0000 |
|---|---|---|
| committer | Jurij Smakov <jurij@wooyd.org> | 2006-12-03 23:36:58 +0000 |
| commit | f77bad895ec5ae1e29de73d0c387cada7171c257 (patch) | |
| tree | c757e2f5ec1a21bca071e280a2307f69823f4dda | |
| parent | cc60dd7b29e3327f2d4d447bf1e820caa541b7ff (diff) | |
| download | kernel_replicant_linux-f77bad895ec5ae1e29de73d0c387cada7171c257.tar.gz kernel_replicant_linux-f77bad895ec5ae1e29de73d0c387cada7171c257.tar.bz2 kernel_replicant_linux-f77bad895ec5ae1e29de73d0c387cada7171c257.zip | |
Add bugfix/sunhme-pci-enable.patch, fixing the failure of sunhme
drivers on x86 hosts due to missing pci_enable_device() and
pci_set_master() calls, lost during code refactoring.
svn path=/dists/sid/linux-2.6/; revision=7923
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/bugfix/sunhme-pci-enable.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series/7 | 1 |
3 files changed, 22 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e9ba838e1bf5..cb039ee15b6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,12 @@ linux-2.6 (2.6.18-7) UNRELEASED; urgency=low * sata: Avoid null pointer dereference in SATA Promise. * cifs: Set CIFS preferred IO size. + [ Jurij Smakov ] + * Add bugfix/sunhme-pci-enable.patch, fixing the failure of sunhme + driver on x86/PCI hosts due to missing pci_enable_device() and + pci_set_master() calls, lost during code refactoring upstream. + (closes: #397460) + -- Bastian Blank <waldi@debian.org> Sat, 2 Dec 2006 10:40:12 +0100 linux-2.6 (2.6.18-6) unstable; urgency=low diff --git a/debian/patches/bugfix/sunhme-pci-enable.patch b/debian/patches/bugfix/sunhme-pci-enable.patch new file mode 100644 index 000000000000..954b6ac71ca3 --- /dev/null +++ b/debian/patches/bugfix/sunhme-pci-enable.patch @@ -0,0 +1,15 @@ +diff -aur a/drivers/net/sunhme.c b/drivers/net/sunhme.c +--- a/drivers/net/sunhme.c 2006-11-18 19:28:22.000000000 -0800 ++++ b/drivers/net/sunhme.c 2006-11-23 10:36:36.000000000 -0800 +@@ -3012,6 +3012,11 @@ + #endif + + err = -ENODEV; ++ ++ if (pci_enable_device(pdev)) ++ goto err_out; ++ pci_set_master(pdev); ++ + if (!strcmp(prom_name, "SUNW,qfe") || !strcmp(prom_name, "qfe")) { + qp = quattro_pci_find(pdev); + if (qp == NULL) diff --git a/debian/patches/series/7 b/debian/patches/series/7 index 65d0cafdc225..4e0f75c9fbeb 100644 --- a/debian/patches/series/7 +++ b/debian/patches/series/7 @@ -3,3 +3,4 @@ + bugfix/fs-hfs-mokb.patch + bugfix/sata-promise-null-deref.patch + bugfix/s390/include-asm-posix_types.patch ++ bugfix/sunhme-pci-enable.patch |