diff for duplicates of <4738517.TNcWBCM3Rf@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 5375c20..48acaa7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,8 @@ Changes in version 2: 2 files changed, 41 insertions(+), 2 deletions(-) Index: usb/drivers/usb/core/hcd.c -=================================--- usb.orig/drivers/usb/core/hcd.c +=================================================================== +--- usb.orig/drivers/usb/core/hcd.c +++ usb/drivers/usb/core/hcd.c @@ -42,6 +42,7 @@ #include <linux/pm_runtime.h> @@ -43,7 +44,7 @@ Index: usb/drivers/usb/core/hcd.c + + if (IS_ERR(phy)) { + retval = PTR_ERR(phy); -+ if (retval = -EPROBE_DEFER) ++ if (retval == -EPROBE_DEFER) + goto err_phy; + } else { + retval = phy_init(phy); @@ -104,7 +105,8 @@ Index: usb/drivers/usb/core/hcd.c usb_phy_shutdown(hcd->usb_phy); usb_put_phy(hcd->usb_phy); Index: usb/include/linux/usb/hcd.h -=================================--- usb.orig/include/linux/usb/hcd.h +=================================================================== +--- usb.orig/include/linux/usb/hcd.h +++ usb/include/linux/usb/hcd.h @@ -107,6 +107,7 @@ struct usb_hcd { * other external phys should be software-transparent diff --git a/a/content_digest b/N1/content_digest index df821d9..9c07c72 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\037148636.BU5lT4M4eC@wasted.cogentembedded.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH v6 2/2] usb: hcd: add generic PHY support\0" - "Date\0Wed, 24 Sep 2014 19:09:44 +0000\0" + "Date\0Wed, 24 Sep 2014 23:09:44 +0400\0" "To\0gregkh@linuxfoundation.org" " linux-usb@vger.kernel.org\0" "Cc\0linux-sh@vger.kernel.org" @@ -36,7 +36,8 @@ " 2 files changed, 41 insertions(+), 2 deletions(-)\n" "\n" "Index: usb/drivers/usb/core/hcd.c\n" - "=================================--- usb.orig/drivers/usb/core/hcd.c\n" + "===================================================================\n" + "--- usb.orig/drivers/usb/core/hcd.c\n" "+++ usb/drivers/usb/core/hcd.c\n" "@@ -42,6 +42,7 @@\n" " #include <linux/pm_runtime.h>\n" @@ -55,7 +56,7 @@ "+\n" "+\t\tif (IS_ERR(phy)) {\n" "+\t\t\tretval = PTR_ERR(phy);\n" - "+\t\t\tif (retval = -EPROBE_DEFER)\n" + "+\t\t\tif (retval == -EPROBE_DEFER)\n" "+\t\t\t\tgoto err_phy;\n" "+\t\t} else {\n" "+\t\t\tretval = phy_init(phy);\n" @@ -116,7 +117,8 @@ " \t\tusb_phy_shutdown(hcd->usb_phy);\n" " \t\tusb_put_phy(hcd->usb_phy);\n" "Index: usb/include/linux/usb/hcd.h\n" - "=================================--- usb.orig/include/linux/usb/hcd.h\n" + "===================================================================\n" + "--- usb.orig/include/linux/usb/hcd.h\n" "+++ usb/include/linux/usb/hcd.h\n" "@@ -107,6 +107,7 @@ struct usb_hcd {\n" " \t * other external phys should be software-transparent\n" @@ -127,4 +129,4 @@ " \t/* Flags that need to be manipulated atomically because they can\n" " \t * change while the host controller is running. Always use" -d17b0c960453ae8a29a15b1d7a27631b07afcca56d047dbb412ed0e11e5197ba +3c9cc56c3ece81e92edbbdf44809a94ddedf9f5ced646f98b1ca234b4f6fa304
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.