diff for duplicates of <524BB883.2040400@grandegger.com> diff --git a/a/1.txt b/N1/1.txt index 3dd3e16..98ac5b0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -41,8 +41,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 @@ -61,8 +60,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 @@ -72,8 +70,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 @@ > +/* @@ -668,7 +665,7 @@ On 09/28/2013 12:11 AM, Sergei Shtylyov wrote: > + > + 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; @@ -975,8 +972,7 @@ On 09/28/2013 12:11 AM, Sergei Shtylyov wrote: > +MODULE_DESCRIPTION("CAN driver for Renesas R-Car SoC"); > +MODULE_ALIAS("platform:" DRV_NAME); > Index: linux-can-next/include/linux/can/platform/rcar_can.h -> =================================================================== -> --- /dev/null +> =================================> --- /dev/null > +++ linux-can-next/include/linux/can/platform/rcar_can.h > @@ -0,0 +1,15 @@ > +#ifndef _CAN_PLATFORM_RCAR_CAN_H_ diff --git a/a/content_digest b/N1/content_digest index 9dca643..30678c3 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\0Wed, 02 Oct 2013 08:09:07 +0200\0" + "Date\0Wed, 02 Oct 2013 06:09:07 +0000\0" "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>" netdev@vger.kernel.org mkl@pengutronix.de @@ -52,8 +52,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" @@ -72,8 +71,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" @@ -83,8 +81,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" @@ -679,7 +676,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" @@ -986,8 +983,7 @@ "> +MODULE_DESCRIPTION(\"CAN driver for Renesas R-Car SoC\");\n" "> +MODULE_ALIAS(\"platform:\" DRV_NAME);\n" "> Index: linux-can-next/include/linux/can/platform/rcar_can.h\n" - "> ===================================================================\n" - "> --- /dev/null\n" + "> =================================> --- /dev/null\n" "> +++ linux-can-next/include/linux/can/platform/rcar_can.h\n" "> @@ -0,0 +1,15 @@\n" "> +#ifndef _CAN_PLATFORM_RCAR_CAN_H_\n" @@ -1012,4 +1008,4 @@ "> \n" > -b272f59421ecf699f12a768323e4d2288f3d7a56dcc902127b2c9ba65687d348 +c09fcc2a5f13fae8a9d034c93c2123b4bd5c8527ddc99364b3ba86d16d09ae71
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.