diff for duplicates of <53B42C25.5060606@ti.com> diff --git a/a/1.txt b/N1/1.txt index b1d7515..a6869e5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -197,7 +197,7 @@ Will add this then. >>>>>> +{ >>>>>> + int ret = 0; >>>>>> + ->>>>>> + BUG_ON(data->tas2552_client == NULL); +>>>>>> + BUG_ON(data->tas2552_client = NULL); >>>>> don't hang the entire machine because of a bug on the amplifier driver, >>>>> WARN() should be enough, followed by the return of an error code. >>>>> @@ -207,7 +207,7 @@ Will add this then. >>>> >>>>>> + >>>>>> + mutex_lock(&data->mutex); ->>>>>> + if (power == data->power_state) +>>>>>> + if (power = data->power_state) >>>>> Same here. Is this really necessary ? It's simple to guarantee this case >>>>> won't happen in code. >>>> Yes this LOC is necessary. It is checking the current state of the tas2552. diff --git a/a/content_digest b/N1/content_digest index 4aa1408..e1f0d23 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,7 +6,7 @@ "ref\020140702154323.GD5541@saruman.home\0" "From\0Dan Murphy <dmurphy@ti.com>\0" "Subject\0Re: [PATCH v3] ASoC: tas2552: Support TI TAS2552 Amplifier\0" - "Date\0Wed, 2 Jul 2014 10:58:29 -0500\0" + "Date\0Wed, 02 Jul 2014 15:58:29 +0000\0" "To\0balbi@ti.com\0" "Cc\0linux-sound@vger.kernel.org" linux-kernel@vger.kernel.org @@ -214,7 +214,7 @@ ">>>>>> +{\n" ">>>>>> +\tint\tret = 0;\n" ">>>>>> +\n" - ">>>>>> +\tBUG_ON(data->tas2552_client == NULL);\n" + ">>>>>> +\tBUG_ON(data->tas2552_client = NULL);\n" ">>>>> don't hang the entire machine because of a bug on the amplifier driver,\n" ">>>>> WARN() should be enough, followed by the return of an error code.\n" ">>>>>\n" @@ -224,7 +224,7 @@ ">>>>\n" ">>>>>> +\n" ">>>>>> +\tmutex_lock(&data->mutex);\n" - ">>>>>> +\tif (power == data->power_state)\n" + ">>>>>> +\tif (power = data->power_state)\n" ">>>>> Same here. Is this really necessary ? It's simple to guarantee this case\n" ">>>>> won't happen in code.\n" ">>>> Yes this LOC is necessary. It is checking the current state of the tas2552.\n" @@ -390,4 +390,4 @@ "------------------\n" Dan Murphy -8921f4e078c3671dc54836978868a584d73bc3e6afdd0cbd28b407a0c458be25 +c0c8118edefc45763c1f1e224f928537cf887fd17c91892e6402a506ceeca2f2
diff --git a/a/content_digest b/N2/content_digest index 4aa1408..fc5fa7d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -7,12 +7,12 @@ "From\0Dan Murphy <dmurphy@ti.com>\0" "Subject\0Re: [PATCH v3] ASoC: tas2552: Support TI TAS2552 Amplifier\0" "Date\0Wed, 2 Jul 2014 10:58:29 -0500\0" - "To\0balbi@ti.com\0" - "Cc\0linux-sound@vger.kernel.org" - linux-kernel@vger.kernel.org - alsa-devel@alsa-project.org - broonie@kernel.org - " devicetree@vger.kernel.org\0" + "To\0<balbi@ti.com>\0" + "Cc\0<linux-sound@vger.kernel.org>" + <linux-kernel@vger.kernel.org> + <alsa-devel@alsa-project.org> + <broonie@kernel.org> + " <devicetree@vger.kernel.org>\0" "\00:1\0" "b\0" "Felipe\n" @@ -390,4 +390,4 @@ "------------------\n" Dan Murphy -8921f4e078c3671dc54836978868a584d73bc3e6afdd0cbd28b407a0c458be25 +c6f08cace281eb5234afd0defeda2bc5d570d77dfa9b109286ff3a548d5206b3
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.