[Armadeus-commitlog] SF.net SVN: armadeus:[1092] branches/release-3.0/buildroot/target/device/ armadeus/linux/kernel-patches/2.6.27.13/088-can-mcp2515.patch

[<ar...@us...>]

Revision: 1092
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1092&view=rev
Author:   artemys
Date:     2009-02-24 15:50:06 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
[BRANCH] [LINUX] Get fixes from trunk (rev 1090) for CAN on APF27

Revision Links:
--------------
    http://armadeus.svn.sourceforge.net/armadeus/?rev=1090&view=rev

Modified Paths:
--------------
    branches/release-3.0/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/088-can-mcp2515.patch

Modified: branches/release-3.0/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/088-can-mcp2515.patch
===================================================================
--- branches/release-3.0/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/088-can-mcp2515.patch	2009-02-24 15:48:33 UTC (rev 1091)
+++ branches/release-3.0/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/088-can-mcp2515.patch	2009-02-24 15:50:06 UTC (rev 1092)
@@ -29,7 +29,7 @@
 index 0000000..43be336
 --- /dev/null
 +++ b/drivers/net/can/mcp251x.c
-@@ -0,0 +1,1000 @@
+@@ -0,0 +1,1004 @@
 +/* drivers/net/can/mcp251x.c
 + *
 + *	Driver for Microchip MCP251x CAN Controller with SPI Interface
@@ -637,7 +637,11 @@
 +	for (;;) {
 +		if (priv->wake) {
 +			/* Wait whilst the device wakes up */
-+			udelay(200 * (128 * USEC_PER_SEC / pdata->oscillator_frequency));
++            int i = 200 * (128 * USEC_PER_SEC / pdata->oscillator_frequency);
++            if( i> 1000 ) /*large delay, use mdelay*/
++               mdelay( (i+500)/1000);
++            else
++    			udelay(i);
 +			priv->wake = 0;
 +		}
 +


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.