diff for duplicates of <5250530F.6090901@grandegger.com> diff --git a/a/1.txt b/N1/1.txt index bccec01..5cf7971 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,8 +13,7 @@ On 09/28/2013 12:11 AM, Sergei Shtylyov wrote: > 4 files changed, 923 insertions(+) > > Index: linux-can-next/drivers/net/can/Kconfig -> =================================================================== -> --- linux-can-next.orig/drivers/net/can/Kconfig +> =================================> --- linux-can-next.orig/drivers/net/can/Kconfig > +++ linux-can-next/drivers/net/can/Kconfig > @@ -125,6 +125,15 @@ config CAN_GRCAN > endian syntheses of the cores would need some modifications on @@ -33,8 +32,7 @@ On 09/28/2013 12:11 AM, Sergei Shtylyov wrote: > > source "drivers/net/can/sja1000/Kconfig" > Index: linux-can-next/drivers/net/can/Makefile -> =================================================================== -> --- linux-can-next.orig/drivers/net/can/Makefile +> =================================> --- linux-can-next.orig/drivers/net/can/Makefile > +++ linux-can-next/drivers/net/can/Makefile > @@ -25,5 +25,6 @@ obj-$(CONFIG_CAN_JANZ_ICAN3) += janz-ica > obj-$(CONFIG_CAN_FLEXCAN) += flexcan.o @@ -44,8 +42,7 @@ On 09/28/2013 12:11 AM, Sergei Shtylyov wrote: > > ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG > Index: linux-can-next/drivers/net/can/rcar_can.c -> =================================================================== -> --- /dev/null +> =================================> --- /dev/null > +++ linux-can-next/drivers/net/can/rcar_can.c > @@ -0,0 +1,898 @@ > +/* @@ -687,7 +684,7 @@ support it here (if the hardware is working properly): > + > + spin_lock_irqsave(&priv->mier_lock, flags); > + mier1 = rcar_can_readl(priv, RCAR_CAN_MIER1); -> + if (unlikely(mier1 == ~0U)) { +> + if (unlikely(mier1 = ~0U)) { > + spin_unlock_irqrestore(&priv->mier_lock, flags); > + netif_stop_queue(ndev); > + return NETDEV_TX_BUSY; diff --git a/a/content_digest b/N1/content_digest index 86b7331..a92709b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0201309280211.39068.sergei.shtylyov@cogentembedded.com\0" "From\0Wolfgang Grandegger <wg@grandegger.com>\0" "Subject\0Re: [PATCH] can: add Renesas R-Car CAN driver\0" - "Date\0Sat, 05 Oct 2013 19:57:35 +0200\0" + "Date\0Sat, 05 Oct 2013 17:57:35 +0000\0" "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>" netdev@vger.kernel.org mkl@pengutronix.de @@ -24,8 +24,7 @@ "> 4 files changed, 923 insertions(+)\n" "> \n" "> Index: linux-can-next/drivers/net/can/Kconfig\n" - "> ===================================================================\n" - "> --- linux-can-next.orig/drivers/net/can/Kconfig\n" + "> =================================> --- linux-can-next.orig/drivers/net/can/Kconfig\n" "> +++ linux-can-next/drivers/net/can/Kconfig\n" "> @@ -125,6 +125,15 @@ config CAN_GRCAN\n" "> \t endian syntheses of the cores would need some modifications on\n" @@ -44,8 +43,7 @@ "> \n" "> source \"drivers/net/can/sja1000/Kconfig\"\n" "> Index: linux-can-next/drivers/net/can/Makefile\n" - "> ===================================================================\n" - "> --- linux-can-next.orig/drivers/net/can/Makefile\n" + "> =================================> --- linux-can-next.orig/drivers/net/can/Makefile\n" "> +++ linux-can-next/drivers/net/can/Makefile\n" "> @@ -25,5 +25,6 @@ obj-$(CONFIG_CAN_JANZ_ICAN3)\t+= janz-ica\n" "> obj-$(CONFIG_CAN_FLEXCAN)\t+= flexcan.o\n" @@ -55,8 +53,7 @@ "> \n" "> ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG\n" "> Index: linux-can-next/drivers/net/can/rcar_can.c\n" - "> ===================================================================\n" - "> --- /dev/null\n" + "> =================================> --- /dev/null\n" "> +++ linux-can-next/drivers/net/can/rcar_can.c\n" "> @@ -0,0 +1,898 @@\n" "> +/*\n" @@ -698,7 +695,7 @@ "> +\n" "> +\tspin_lock_irqsave(&priv->mier_lock, flags);\n" "> +\tmier1 = rcar_can_readl(priv, RCAR_CAN_MIER1);\n" - "> +\tif (unlikely(mier1 == ~0U)) {\n" + "> +\tif (unlikely(mier1 = ~0U)) {\n" "> +\t\tspin_unlock_irqrestore(&priv->mier_lock, flags);\n" "> +\t\tnetif_stop_queue(ndev);\n" "> +\t\treturn NETDEV_TX_BUSY;\n" @@ -926,4 +923,4 @@ "\n" Wolfgang. -321597cbb89c3b32d7c06c3174a6c4943b5082dbf7f5c3621328358ccfe71ba8 +ef71bc9a5e45913017bf1670f523f84a3f60a51c4393d15c2c8a0f2b7ea969e7
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.