* [PATCH 02/05] mfd: enable onkey on max8925
2010-05-19 6:57 [PATCH 02/05] mfd: enable onkey on max8925 Haojian Zhuang
@ 2010-06-18 18:04 ` Samuel Ortiz
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Ortiz @ 2010-06-18 18:04 UTC (permalink / raw)
To: linux-arm-kernel
Hi Haojian,
On Wed, May 19, 2010 at 02:57:17PM +0800, Haojian Zhuang wrote:
> @@ -596,6 +614,15 @@ int __devinit max8925_device_init(struct
> max8925_chip *chip,
> dev_err(chip->dev, "Failed to add rtc subdev\n");
> goto out;
> }
> +
> + ret = mfd_add_devices(chip->dev, 0, &onkey_devs[0],
> + ARRAY_SIZE(onkey_devs),
> + &onkey_resources[0], 0);
> + if (ret < 0) {
> + dev_err(chip->dev, "Failed to add onkey subdev\n");
> + goto out;
I think you want goto out_dev here.
I fixed it up for you and applied this patch to my for-next tree.
Cheers,
Samuel.
> + }
> +
> if (pdata && pdata->regulator[0]) {
> ret = mfd_add_devices(chip->dev, 0, ®ulator_devs[0],
> ARRAY_SIZE(regulator_devs),
> --
> 1.5.6.5
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 2+ messages in thread