diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
commit | d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902 (patch) | |
tree | 4fe17a547c8c4e403c18cdc6a6c5e30c6f437bc9 /drivers/power/isp1704_charger.c | |
parent | bf68665d7a5647591258c120382fd64465db7d63 (diff) | |
parent | 37c367ecdb9a01c9acc980e6e17913570a1788a7 (diff) |
Merge branch 'for-linus' into HEAD
Diffstat (limited to 'drivers/power/isp1704_charger.c')
-rw-r--r-- | drivers/power/isp1704_charger.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c index 80edb7d8cb5..0b4cf9d6329 100644 --- a/drivers/power/isp1704_charger.c +++ b/drivers/power/isp1704_charger.c @@ -444,8 +444,6 @@ static int isp1704_charger_probe(struct platform_device *pdev) ret = PTR_ERR(isp->phy); goto fail0; } - if (!isp->phy) - goto fail0; isp->dev = &pdev->dev; platform_set_drvdata(pdev, isp); |