diff for duplicates of <20170724094939.21477-1-johan@kernel.org> diff --git a/a/1.txt b/N1/1.txt index bda97bb..d7d2bbe 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,14 +38,14 @@ This patch has been verified on 4.13-rc2, 4.12 and 4.9 using a BBB Fixes: c338412b5ded ("usb: musb: unconditionally save and restore the context on suspend") Fixes: a1fc1920aaaa ("usb: musb: core: make sure musb is in RPM_ACTIVE on resume") Fixes: 1c4d0b4e1806 ("usb: musb: Remove pm_runtime_set_irq_safe") -Cc: stable <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # 4.8 -Cc: Alan Stern <stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org> -Cc: Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> -Cc: Dave Gerlach <d-gerlach-l0cyMroinI0@public.gmane.org> -Cc: Rafael J. Wysocki <rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org> -Cc: Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> -Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> -Signed-off-by: Johan Hovold <johan-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> +Cc: stable <stable@vger.kernel.org> # 4.8 +Cc: Alan Stern <stern@rowland.harvard.edu> +Cc: Daniel Mack <zonque@gmail.com> +Cc: Dave Gerlach <d-gerlach@ti.com> +Cc: Rafael J. Wysocki <rjw@rjwysocki.net> +Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Cc: Tony Lindgren <tony@atomide.com> +Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/usb/musb/musb_core.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) @@ -79,3 +79,19 @@ index 87cbd56cc761..b67692857daf 100644 - pm_runtime_disable(dev); - pm_runtime_set_active(dev); - pm_runtime_enable(dev); +- + musb_start(musb); + + spin_lock_irqsave(&musb->lock, flags); +@@ -2738,6 +2737,9 @@ static int musb_resume(struct device *dev) + error); + spin_unlock_irqrestore(&musb->lock, flags); + ++ pm_runtime_mark_last_busy(dev); ++ pm_runtime_put_autosuspend(dev); ++ + return 0; + } + +-- +2.13.3 diff --git a/a/content_digest b/N1/content_digest index f4e0c6f..4372a42 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,20 @@ - "From\0Johan Hovold <johan-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" + "From\0Johan Hovold <johan@kernel.org>\0" "Subject\0[PATCH] USB: musb: fix external abort on suspend\0" "Date\0Mon, 24 Jul 2017 11:49:39 +0200\0" - "To\0Bin Liu <b-liu-l0cyMroinI0@public.gmane.org>\0" - "Cc\0Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>" - linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-pm-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> - Alan Stern <stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org> - Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - Dave Gerlach <d-gerlach-l0cyMroinI0@public.gmane.org> - Rafael J . Wysocki <rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org> - Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> - " Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>\0" + "To\0Bin Liu <b-liu@ti.com>\0" + "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" + linux-usb@vger.kernel.org + linux-omap@vger.kernel.org + linux-pm@vger.kernel.org + linux-kernel@vger.kernel.org + Johan Hovold <johan@kernel.org> + stable <stable@vger.kernel.org> + Alan Stern <stern@rowland.harvard.edu> + Daniel Mack <zonque@gmail.com> + Dave Gerlach <d-gerlach@ti.com> + Rafael J . Wysocki <rjw@rjwysocki.net> + Sebastian Andrzej Siewior <bigeasy@linutronix.de> + " Tony Lindgren <tony@atomide.com>\0" "\00:1\0" "b\0" "Make sure that the controller is runtime resumed when system suspending\n" @@ -57,14 +57,14 @@ "Fixes: c338412b5ded (\"usb: musb: unconditionally save and restore the context on suspend\")\n" "Fixes: a1fc1920aaaa (\"usb: musb: core: make sure musb is in RPM_ACTIVE on resume\")\n" "Fixes: 1c4d0b4e1806 (\"usb: musb: Remove pm_runtime_set_irq_safe\")\n" - "Cc: stable <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\t# 4.8\n" - "Cc: Alan Stern <stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org>\n" - "Cc: Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" - "Cc: Dave Gerlach <d-gerlach-l0cyMroinI0@public.gmane.org>\n" - "Cc: Rafael J. Wysocki <rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org>\n" - "Cc: Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>\n" - "Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>\n" - "Signed-off-by: Johan Hovold <johan-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" + "Cc: stable <stable@vger.kernel.org>\t# 4.8\n" + "Cc: Alan Stern <stern@rowland.harvard.edu>\n" + "Cc: Daniel Mack <zonque@gmail.com>\n" + "Cc: Dave Gerlach <d-gerlach@ti.com>\n" + "Cc: Rafael J. Wysocki <rjw@rjwysocki.net>\n" + "Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>\n" + "Cc: Tony Lindgren <tony@atomide.com>\n" + "Signed-off-by: Johan Hovold <johan@kernel.org>\n" "---\n" " drivers/usb/musb/musb_core.c | 18 ++++++++++--------\n" " 1 file changed, 10 insertions(+), 8 deletions(-)\n" @@ -97,6 +97,22 @@ "-\t */\n" "-\tpm_runtime_disable(dev);\n" "-\tpm_runtime_set_active(dev);\n" - "-\tpm_runtime_enable(dev);" + "-\tpm_runtime_enable(dev);\n" + "-\n" + " \tmusb_start(musb);\n" + " \n" + " \tspin_lock_irqsave(&musb->lock, flags);\n" + "@@ -2738,6 +2737,9 @@ static int musb_resume(struct device *dev)\n" + " \t\t\terror);\n" + " \tspin_unlock_irqrestore(&musb->lock, flags);\n" + " \n" + "+\tpm_runtime_mark_last_busy(dev);\n" + "+\tpm_runtime_put_autosuspend(dev);\n" + "+\n" + " \treturn 0;\n" + " }\n" + " \n" + "-- \n" + 2.13.3 -1a43a0ecf661b00c6386ab55479020f84162a6d752334d5b796c1e35fed18e93 +aee9ed66876cb8cb80a1b24e465274af5611a0116a1cd6ec29fb47b761e43e1d
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.