From 1a18a4a036ac13c549075d121cbae79f2b86182f Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 29 Mar 2010 00:33:41 +0000 Subject: [PATCH] rt2860sta: Fix argument to linux_pci_unmap_single() (Closes: #575726) svn path=/dists/sid/linux-2.6/; revision=15454 --- debian/changelog | 1 + ...x-argument-to-linux_pci_unmap_single.patch | 43 +++++++++++++++++++ debian/patches/series/11 | 1 + 3 files changed, 45 insertions(+) create mode 100644 debian/patches/bugfix/all/rt2860sta-Fix-argument-to-linux_pci_unmap_single.patch diff --git a/debian/changelog b/debian/changelog index 526bcbf83..969612d1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ linux-2.6 (2.6.32-11) UNRELEASED; urgency=low since it disconnects the wrong device (Closes: #573607) * linux-headers-*: Support postinst hooks in /etc/kernel/header_postinst.d, thanks to Michael Gilbert (Closes: #569724) + * rt2860sta: Fix argument to linux_pci_unmap_single() (Closes: #575726) [ maximilian attems] * [alpha, hppa] Disable oprofile as tracing code is unsupported here. diff --git a/debian/patches/bugfix/all/rt2860sta-Fix-argument-to-linux_pci_unmap_single.patch b/debian/patches/bugfix/all/rt2860sta-Fix-argument-to-linux_pci_unmap_single.patch new file mode 100644 index 000000000..a67330ded --- /dev/null +++ b/debian/patches/bugfix/all/rt2860sta-Fix-argument-to-linux_pci_unmap_single.patch @@ -0,0 +1,43 @@ +Subject: [PATCH] rt2860sta: Fix argument to linux_pci_unmap_single() +From: Ben Hutchings +Date: Mon, 29 Mar 2010 01:09:17 +0100 + +John Halton wrote in : +> Whenever wpa_supplicant is deactivated (whether by killing the process or +> during a normal shutdown) I am getting a kerneloops that prevents the +> computer from completing shutdown. Here is the relevant syslog output: + +The backtrace points to an incorrect call from RTMPFreeTxRxRingMemory() +into linux_pci_unmap_single(). This appears to have been fixed in Linux +2.6.33 by this change: + +commit ca97b8388838ee9ea4b4bad04948f8f7f8a607a3 +Author: Bartlomiej Zolnierkiewicz +Date: Tue Sep 22 20:44:07 2009 +0200 + + Staging: rt28x0: updates from vendor's V2.1.0.0 drivers + +For stable-2.6.32, just fix this one function call. + +Signed-off-by: Ben Hutchings +--- + drivers/staging/rt2860/common/2860_rtmp_init.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/staging/rt2860/common/2860_rtmp_init.c b/drivers/staging/rt2860/common/2860_rtmp_init.c +index 0bc0fb9..98b0f8e 100644 +--- a/drivers/staging/rt2860/common/2860_rtmp_init.c ++++ b/drivers/staging/rt2860/common/2860_rtmp_init.c +@@ -716,7 +716,7 @@ VOID RTMPFreeTxRxRingMemory( + { + if ((pAd->RxRing.Cell[index].DmaBuf.AllocVa) && (pAd->RxRing.Cell[index].pNdisPacket)) + { +- PCI_UNMAP_SINGLE(pObj->pci_dev, pAd->RxRing.Cell[index].DmaBuf.AllocPa, pAd->RxRing.Cell[index].DmaBuf.AllocSize, PCI_DMA_FROMDEVICE); ++ PCI_UNMAP_SINGLE(pAd, pAd->RxRing.Cell[index].DmaBuf.AllocPa, pAd->RxRing.Cell[index].DmaBuf.AllocSize, PCI_DMA_FROMDEVICE); + RELEASE_NDIS_PACKET(pAd, pAd->RxRing.Cell[index].pNdisPacket, NDIS_STATUS_SUCCESS); + } + } +-- +1.7.0.3 + + diff --git a/debian/patches/series/11 b/debian/patches/series/11 index 60eb51368..210316dea 100644 --- a/debian/patches/series/11 +++ b/debian/patches/series/11 @@ -6,3 +6,4 @@ + bugfix/x86/eeepc-laptop-disable-wireless-hotplug-for-1201N.patch + bugfix/x86/eeepc-laptop-disable-wireless-hotplug-for-1005PE.patch + bugfix/all/ssb_check_for_sprom.patch ++ bugfix/all/rt2860sta-Fix-argument-to-linux_pci_unmap_single.patch