diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-10 10:39:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-10 10:39:23 +0100 |
| commit | 8e94114a40f2c58637bf99d2fb8f25ddfe497ce2 (patch) | |
| tree | 89fe77c1f3bd873e5734c5d5c98865c24c66dd19 /drivers/phy/broadcom | |
| parent | db4e8de1935b0202960e9ebb88ab93e8bd1e66b1 (diff) | |
| parent | 9a8b9434c60f40e4d2603c822a68af6a9ca710df (diff) | |
Merge tag 'phy-fixes2-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy into char-misc-next
Vinod writes:
phy: second round of phy fixes for v5.11
- rockchip: init return and vednor prefix to dt-property
- cpcap: bool conversion fix
- lantiq: clock enable fix
- lgm: kconfig depends on x86
- mediatek: add mising MODULE_DEVICE_TABLE()
* tag 'phy-fixes2-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
phy: mediatek: Add missing MODULE_DEVICE_TABLE()
phy: phy-brcm-sata: remove unneeded semicolon
phy: USB_LGM_PHY should depend on X86
phy: lantiq: rcu-usb2: wait after clock enable
phy: rockchip: emmc, add vendor prefix to dts properties
devicetree: phy: rockchip-emmc optional add vendor prefix
phy: cpcap-usb: remove unneeded conversion to bool
phy: rockchip-emmc: emmc_phy_init() always return 0
Diffstat (limited to 'drivers/phy/broadcom')
| -rw-r--r-- | drivers/phy/broadcom/phy-brcm-sata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/phy/broadcom/phy-brcm-sata.c b/drivers/phy/broadcom/phy-brcm-sata.c index 3ecf41359591..769c707d9b71 100644 --- a/drivers/phy/broadcom/phy-brcm-sata.c +++ b/drivers/phy/broadcom/phy-brcm-sata.c @@ -651,7 +651,7 @@ static int brcm_dsl_sata_init(struct brcm_sata_port *port) break; msleep(20); try--; - }; + } if (!try) { /* PLL did not lock; give up */ |