diff for duplicates of <20170330101542.15384-6-johan@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 6ec0d2e..80d3484 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,9 +10,9 @@ initialisation back to to nci_allocate_device() as the firmware-workqueue name is now derived from the nfc-device name. Fixes: 3194c6870158 ("NFC: nfcmrvl: add firmware download support") -Cc: stable <stable@vger.kernel.org> # 4.4 -Cc: Vincent Cuissard <cuissard@marvell.com> -Signed-off-by: Johan Hovold <johan@kernel.org> +Cc: stable <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # 4.4 +Cc: Vincent Cuissard <cuissard-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> +Signed-off-by: Johan Hovold <johan-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> --- drivers/nfc/nfcmrvl/main.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) @@ -48,14 +48,3 @@ index 3e3fc9588f10..a446590a71ca 100644 - nfc_err(dev, "failed to initialize FW download %d\n", rc); - goto error_free_dev; - } -- - nfc_info(dev, "registered with nci successfully\n"); - return priv; - -+error_fw_dnld_deinit: -+ nfcmrvl_fw_dnld_deinit(priv); - error_free_dev: - nci_free_device(priv->ndev); - error_free_gpio: --- -2.12.2 diff --git a/a/content_digest b/N1/content_digest index 9606d56..b305643 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,17 @@ "ref\020170330101542.15384-1-johan@kernel.org\0" - "From\0Johan Hovold <johan@kernel.org>\0" + "ref\020170330101542.15384-1-johan-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org\0" + "From\0Johan Hovold <johan-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" "Subject\0[PATCH v2 5/8] NFC: nfcmrvl: fix firmware-management initialisation\0" "Date\0Thu, 30 Mar 2017 12:15:39 +0200\0" - "To\0Lauro Ramos Venancio <lauro.venancio@openbossa.org>" - Aloisio Almeida Jr <aloisio.almeida@openbossa.org> - " Samuel Ortiz <sameo@linux.intel.com>\0" - "Cc\0linux-wireless@vger.kernel.org" - netdev@vger.kernel.org - linux-kernel@vger.kernel.org - Johan Hovold <johan@kernel.org> - stable <stable@vger.kernel.org> - " Vincent Cuissard <cuissard@marvell.com>\0" + "To\0Lauro Ramos Venancio <lauro.venancio-430g2QfJUUCGglJvpFV4uA@public.gmane.org>" + Aloisio Almeida Jr <aloisio.almeida-430g2QfJUUCGglJvpFV4uA@public.gmane.org> + " Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>\0" + "Cc\0linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Johan Hovold <johan-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + stable <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + " Vincent Cuissard <cuissard-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>\0" "\00:1\0" "b\0" "The nci-device was never deregistered in the event that\n" @@ -25,9 +26,9 @@ "firmware-workqueue name is now derived from the nfc-device name.\n" "\n" "Fixes: 3194c6870158 (\"NFC: nfcmrvl: add firmware download support\")\n" - "Cc: stable <stable@vger.kernel.org> # 4.4\n" - "Cc: Vincent Cuissard <cuissard@marvell.com>\n" - "Signed-off-by: Johan Hovold <johan@kernel.org>\n" + "Cc: stable <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # 4.4\n" + "Cc: Vincent Cuissard <cuissard-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>\n" + "Signed-off-by: Johan Hovold <johan-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" "---\n" " drivers/nfc/nfcmrvl/main.c | 16 +++++++++-------\n" " 1 file changed, 9 insertions(+), 7 deletions(-)\n" @@ -62,17 +63,6 @@ "-\tif (rc) {\n" "-\t\tnfc_err(dev, \"failed to initialize FW download %d\\n\", rc);\n" "-\t\tgoto error_free_dev;\n" - "-\t}\n" - "-\n" - " \tnfc_info(dev, \"registered with nci successfully\\n\");\n" - " \treturn priv;\n" - " \n" - "+error_fw_dnld_deinit:\n" - "+\tnfcmrvl_fw_dnld_deinit(priv);\n" - " error_free_dev:\n" - " \tnci_free_device(priv->ndev);\n" - " error_free_gpio:\n" - "-- \n" - 2.12.2 + "-\t}" -a030cad5a03908fb2ab89387aa29feed51d6eff6ba66294444e0f6f700f82894 +ebeb7cc179a62ce50f6f1360d2b4710bb1d7decce0051488138bb1a816310fc2
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.