public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] USB fixes for v3.19-rc5
@ 2015-01-12 18:07 Felipe Balbi
  2015-01-12 18:52 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: Felipe Balbi @ 2015-01-12 18:07 UTC (permalink / raw)
  To: Greg KH; +Cc: Linux Kernel Mailing List, Linux USB Mailing List, Felipe Balbi

Hi Greg,

Looks like this will be my last pull request for v3.19. Please consider merging
on top of your usb-linus branch.

Note that there will be a conflict when merging on that branch, the solution is
to use the version from my tree as that's more correct. Here's how the related
code should look like:

devm_usb_ge_phy_by_phandle():

[ ... ]

195         phy = __of_usb_find_phy(node);
196         if (IS_ERR(phy)) {
197                 devres_free(ptr);
198                 goto err1;
199         }
200 
201         if (!try_module_get(phy->dev->driver->owner)) {
202                 phy = ERR_PTR(-ENODEV);
203                 devres_free(ptr);
204                 goto err1;
205         }

[ ... ]

cheers

The following changes since commit 6785a1034461c2d2c205215f63a50a740896e55b:

  usb: gadget: udc: atmel: fix possible IN hang issue (2014-12-22 10:41:15 -0600)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/fixes-for-v3.19-rc5

for you to fetch changes up to 5fb694f96e7c19e66b1c55124b98812e32e3efa5:

  usb: gadget: udc: atmel: fix possible oops when unloading module (2015-01-09 18:15:11 -0600)

----------------------------------------------------------------
usb: fixes for v3.19-rc5

Just three fixes this time. An oops fix in ep_write() from gadgetfs,
another oops for the Atmel UDC when unloading a gadget driver and
the fix for PHY deferred probing.

Signed-off-by: Felipe Balbi <balbi@ti.com>

----------------------------------------------------------------
Dan Carpenter (1):
      usb: gadget: gadgetfs: fix an oops in ep_write()

Songjun Wu (1):
      usb: gadget: udc: atmel: fix possible oops when unloading module

Thierry Reding (1):
      usb: phy: Restore deferred probing path

 drivers/usb/gadget/legacy/inode.c       |  1 +
 drivers/usb/gadget/udc/atmel_usba_udc.c | 12 +++++++++++-
 drivers/usb/phy/phy.c                   | 14 ++++++++++----
 3 files changed, 22 insertions(+), 5 deletions(-)

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [GIT PULL] USB fixes for v3.19-rc5
  2015-01-12 18:07 [GIT PULL] USB fixes for v3.19-rc5 Felipe Balbi
@ 2015-01-12 18:52 ` Greg KH
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2015-01-12 18:52 UTC (permalink / raw)
  To: Felipe Balbi; +Cc: Linux Kernel Mailing List, Linux USB Mailing List

On Mon, Jan 12, 2015 at 12:07:20PM -0600, Felipe Balbi wrote:
> Hi Greg,
> 
> Looks like this will be my last pull request for v3.19. Please consider merging
> on top of your usb-linus branch.
> 
> Note that there will be a conflict when merging on that branch, the solution is
> to use the version from my tree as that's more correct. Here's how the related
> code should look like:
> 
> devm_usb_ge_phy_by_phandle():
> 
> [ ... ]
> 
> 195         phy = __of_usb_find_phy(node);
> 196         if (IS_ERR(phy)) {
> 197                 devres_free(ptr);
> 198                 goto err1;
> 199         }
> 200 
> 201         if (!try_module_get(phy->dev->driver->owner)) {
> 202                 phy = ERR_PTR(-ENODEV);
> 203                 devres_free(ptr);
> 204                 goto err1;
> 205         }
> 
> [ ... ]
> 
> cheers
> 
> The following changes since commit 6785a1034461c2d2c205215f63a50a740896e55b:
> 
>   usb: gadget: udc: atmel: fix possible IN hang issue (2014-12-22 10:41:15 -0600)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/fixes-for-v3.19-rc5

Pulled and pushed out.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-01-12 18:52 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-12 18:07 [GIT PULL] USB fixes for v3.19-rc5 Felipe Balbi
2015-01-12 18:52 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox