diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-10 11:47:50 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-10 11:47:50 (GMT) |
| commit | 2aebe3f3b20724e09ec76b196e16404d1ea573d9 (patch) | |
| tree | ef667cb786a58d3bb2639ad5c488e5bac501defa /drivers/phy/phy-berlin-sata.c | |
| parent | c8d1bc12c7986c166bd3504213d9df2bc11ad7d6 (diff) | |
| parent | e95cf393d2097a7744f98de1c7936fcbde0843e3 (diff) | |
| download | linux-2aebe3f3b20724e09ec76b196e16404d1ea573d9.tar.xz | |
Merge tag 'for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next
Kishon writes:
New Features
============
*) Add driver for USB PHYs on sun9i
*) Add driver for USB PHY on dm816x
*) Modified exynos5-usbdrd driver to add support for Exynos5433 SoC
Fixes
=====
*) Fix power_on/power_off failure paths in some drivers
*) Make miphy365x use generic PHY type constants
*) Fix build errors due to missing export symbols in qcom-ufs driver
*) Make all the functions return proper error values
Cleanups
========
*) use PTR_ERR_OR_ZERO to simplify code
*) use devm_kcalloc instead of devm_kzalloc with multiply
*) remove un-necessary ifdef CONFIG_OF
Diffstat (limited to 'drivers/phy/phy-berlin-sata.c')
| -rw-r--r-- | drivers/phy/phy-berlin-sata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/phy/phy-berlin-sata.c b/drivers/phy/phy-berlin-sata.c index 099eee8..6f3e06d 100644 --- a/drivers/phy/phy-berlin-sata.c +++ b/drivers/phy/phy-berlin-sata.c @@ -218,7 +218,7 @@ static int phy_berlin_sata_probe(struct platform_device *pdev) if (priv->nphys == 0) return -ENODEV; - priv->phys = devm_kzalloc(dev, priv->nphys * sizeof(*priv->phys), + priv->phys = devm_kcalloc(dev, priv->nphys, sizeof(*priv->phys), GFP_KERNEL); if (!priv->phys) return -ENOMEM; |