Re: [GIT PULL] USB fixes for v3.19-rc5

[Greg KH]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/