diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-16 19:51:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-16 19:51:27 -0400 |
commit | 8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e (patch) | |
tree | 88cd7852d59ebae54fcc2f57019ea13284042962 /drivers/extcon | |
parent | 6f586e663e3b3674cadad0d5329424b006a0a289 (diff) | |
parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) |
Merge 3.6-rc7 into driver-core-next
This pulls in the fixes in that branch that are needed here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/extcon')
-rw-r--r-- | drivers/extcon/extcon-max77693.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c index 758a871fcfdc..e21387e2da5c 100644 --- a/drivers/extcon/extcon-max77693.c +++ b/drivers/extcon/extcon-max77693.c | |||
@@ -669,13 +669,18 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev) | |||
669 | } | 669 | } |
670 | info->dev = &pdev->dev; | 670 | info->dev = &pdev->dev; |
671 | info->max77693 = max77693; | 671 | info->max77693 = max77693; |
672 | info->max77693->regmap_muic = regmap_init_i2c(info->max77693->muic, | 672 | if (info->max77693->regmap_muic) |
673 | &max77693_muic_regmap_config); | 673 | dev_dbg(&pdev->dev, "allocate register map\n"); |
674 | if (IS_ERR(info->max77693->regmap_muic)) { | 674 | else { |
675 | ret = PTR_ERR(info->max77693->regmap_muic); | 675 | info->max77693->regmap_muic = devm_regmap_init_i2c( |
676 | dev_err(max77693->dev, | 676 | info->max77693->muic, |
677 | "failed to allocate register map: %d\n", ret); | 677 | &max77693_muic_regmap_config); |
678 | goto err_regmap; | 678 | if (IS_ERR(info->max77693->regmap_muic)) { |
679 | ret = PTR_ERR(info->max77693->regmap_muic); | ||
680 | dev_err(max77693->dev, | ||
681 | "failed to allocate register map: %d\n", ret); | ||
682 | goto err_regmap; | ||
683 | } | ||
679 | } | 684 | } |
680 | platform_set_drvdata(pdev, info); | 685 | platform_set_drvdata(pdev, info); |
681 | mutex_init(&info->mutex); | 686 | mutex_init(&info->mutex); |