[kernel] r7923 - in dists/sid/linux-2.6/debian: . patches/bugfix patches/series

[Jurij Smakov]

Author: jurij-guest
Date: Mon Dec  4 00:36:58 2006
New Revision: 7923

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/sunhme-pci-enable.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/7
Log:
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.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Dec  4 00:36:58 2006
@@ -16,6 +16,12 @@
   * 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 at debian.org>  Sat,  2 Dec 2006 10:40:12 +0100
 
 linux-2.6 (2.6.18-6) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/sunhme-pci-enable.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/sunhme-pci-enable.patch	Mon Dec  4 00:36:58 2006
@@ -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)

Modified: dists/sid/linux-2.6/debian/patches/series/7
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/7	(original)
+++ dists/sid/linux-2.6/debian/patches/series/7	Mon Dec  4 00:36:58 2006
@@ -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