Attachment 172501 Details for Bug 233345 – Fix for system freeze on eject

[patch] Fix for system freeze on eject

rt61pci_hotplug.diff (text/plain), 1.25 KB, created by Ivo van Doorn on 2007-08-25 13:37:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivo van Doorn

Created: 2007-08-25 13:37:16 UTC

Size: 1.25 KB

patch

obsolete

>diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
>index af90c5c..2dc8f31 100644
>--- a/drivers/net/wireless/rt2x00/rt61pci.c
>+++ b/drivers/net/wireless/rt2x00/rt61pci.c
>@@ -1803,23 +1803,37 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
> 	struct data_desc *txd;
> 	u32 word;
> 	u32 reg;
>+	u32 old_reg;
>+	int type;
> 	int index;
> 	int tx_status;
> 	int retry;
> 
>+	/*
>+	 * During each loop we will compare the freshly read
>+	 * STA_CSR4 register value with the value read from
>+	 * the previous loop. If the 2 values are equal then
>+	 * we should stop processing because the chance it
>+	 * quite big that the device has been unplugged and
>+	 * we risk going into an endless loop.
>+	 */
>+	old_reg = 0;
>+
> 	while (1) {
> 		rt2x00pci_register_read(rt2x00dev, STA_CSR4, &reg);
> 		if (!rt2x00_get_field32(reg, STA_CSR4_VALID))
> 			break;
> 
>+		if (old_reg == reg)
>+			break;
>+		old_reg = reg;
>+
> 		/*
> 		 * Skip this entry when it contains an invalid
> 		 * ring identication number.
> 		 */
>-		ring =
>-		    rt2x00lib_get_ring(rt2x00dev,
>-				       rt2x00_get_field32(reg,
>-							  STA_CSR4_PID_TYPE));
>+		type = rt2x00_get_field32(reg, STA_CSR4_PID_TYPE);
>+		ring = rt2x00lib_get_ring(rt2x00dev, type);
> 		if (unlikely(!ring))
> 			continue;
>

Actions: View | Diff

Attachments on bug 233345: 150610 | 172501