diff for duplicates of <52605C8F.5090606@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 7a5617a..807d8dc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,8 +25,7 @@ On 09/29/2013 11:03 PM, Marc Kleine-Budde wrote: [...] >> 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 @@ [...] @@ -277,7 +276,7 @@ explicitly. [...] >> + 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; @@ -463,8 +462,7 @@ Didn't find application that sets this mode. [...] >> 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 18fcaad..6b97e22 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\052487991.6000209@pengutronix.de\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH] can: add Renesas R-Car CAN driver\0" - "Date\0Fri, 18 Oct 2013 01:54:23 +0400\0" + "Date\0Thu, 17 Oct 2013 21:54:23 +0000\0" "To\0Marc Kleine-Budde <mkl@pengutronix.de>\0" "Cc\0netdev@vger.kernel.org" wg@grandegger.com @@ -37,8 +37,7 @@ "[...]\n" "\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" @@ -289,7 +288,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" @@ -475,8 +474,7 @@ "\n" "[...]\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" @@ -501,4 +499,4 @@ "\n" WBR, Sergei -c0a593dc40eaa67c1e0111bb223ea172d5840bf10a1e99e5dc48cec268b193fa +a14ac88513c1172032911b800d819f1b135845c3a88c70af5dc0262327459d4f
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.