On 11/14/2010 12:49 PM, James Womack wrote: > Hey, I tried patching the kernel I downloaded, but the dry runs both > presented errors detailed below: > > james@mercury:/usr/src/linux-source-2.6.32$ patch -p1 --dry-run < > /home/james/rtl8187se_change_panic_to_warn > patching file drivers/staging/rtl8187se/r8185b_init.c > Hunk #1 succeeded at 356 with fuzz 2 (offset 92 lines). > Hunk #2 FAILED at 302. > 1 out of 2 hunks FAILED -- saving rejects to file > drivers/staging/rtl8187se/r8185b_init.c.rej > james@mercury:/usr/src/linux-source-2.6.32$ patch -p1 --dry-run < > /home/james/rtl8187se_ > rtl8187se_change_panic_to_warn rtl8187se_lock_pci_remove > james@mercury:/usr/src/linux-source-2.6.32$ patch -p1 --dry-run < > /home/james/rtl8187se_lock_pci_remove > patching file drivers/staging/rtl8187se/r8180_core.c > patch unexpectedly ends in middle of line > patch: **** unexpected end of file in patch > james@mercury:/usr/src/linux-source-2.6.32$ > > Do I need to do anything to the kernel source before applying the patches? You needed a different version of the patch for 2.6.32. Apply the attached version. You only need the one patch. Larry
This driver issues a kernel panic over conditions that do not justify such drastic action. Change these to log entries with a stack dump. This patch fixes the system crash reported in https://bugs.launchpad.net/ubuntu/+source/linux/+bug/674285. Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx> Reported-and-Tested-by: Robie Basik <rb-oss-3@xxxxxxxxxxxxxxxx> Cc: Stable <stable@xxxxxxxxxx> --- Greg, As this fix keeps the kernel from panicking over a trivial condition, it should be pushed as soon as possible. Larry --- Index: linux-2.6/drivers/staging/rtl8187se/r8185b_init.c =================================================================== --- linux-2.6.orig/drivers/staging/rtl8187se/r8185b_init.c +++ linux-2.6/drivers/staging/rtl8187se/r8185b_init.c @@ -356,8 +356,12 @@ HwHSSIThreeWire( } udelay(10); } - if (TryCnt == TC_3W_POLL_MAX_TRY_CNT) - panic("HwThreeWire(): CmdReg: %#X RE|WE bits are not clear!!\n", u1bTmp); + if (TryCnt == TC_3W_POLL_MAX_TRY_CNT) { + printk(KERN_ERR "rtl8187se: HwThreeWire(): CmdReg:" + " %#X RE|WE bits are not clear!!\n", u1bTmp); + dump_stack(); + return 0; + } // RTL8187S HSSI Read/Write Function u1bTmp = read_nic_byte(dev, RF_SW_CONFIG); @@ -397,13 +401,23 @@ HwHSSIThreeWire( int idx; int ByteCnt = nDataBufBitCnt / 8; //printk("%d\n",nDataBufBitCnt); - if ((nDataBufBitCnt % 8) != 0) - panic("HwThreeWire(): nDataBufBitCnt(%d) should be multiple of 8!!!\n", - nDataBufBitCnt); - - if (nDataBufBitCnt > 64) - panic("HwThreeWire(): nDataBufBitCnt(%d) should <= 64!!!\n", - nDataBufBitCnt); + if ((nDataBufBitCnt % 8) != 0) { + printk(KERN_ERR "rtl8187se: " + "HwThreeWire(): nDataBufBitCnt(%d)" + " should be multiple of 8!!!\n", + nDataBufBitCnt); + dump_stack(); + nDataBufBitCnt += 8; + nDataBufBitCnt &= ~7; + } + + if (nDataBufBitCnt > 64) { + printk(KERN_ERR "rtl8187se: HwThreeWire():" + " nDataBufBitCnt(%d) should <= 64!!!\n", + nDataBufBitCnt); + dump_stack(); + nDataBufBitCnt = 64; + } for(idx = 0; idx < ByteCnt; idx++) {
