From 967f5b16d69bc0ec5b4d3743c664c82471889eed Mon Sep 17 00:00:00 2001 From: "Matti J. Aaltonen" Date: Fri, 25 Feb 2011 14:44:19 -0800 Subject: [PATCH] --- yaml --- r: 233694 b: refs/heads/master c: ac3c8304190ed0daaa2fb01ce2a069be5e2a52a7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/nfc/pn544.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a1675017c825..2b31bcad66b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d73fa4b914eab332d9919132b273b6797b8aface +refs/heads/master: ac3c8304190ed0daaa2fb01ce2a069be5e2a52a7 diff --git a/trunk/drivers/nfc/pn544.c b/trunk/drivers/nfc/pn544.c index bae647264dd6..724f65d8f9e4 100644 --- a/trunk/drivers/nfc/pn544.c +++ b/trunk/drivers/nfc/pn544.c @@ -60,7 +60,7 @@ enum pn544_irq { struct pn544_info { struct miscdevice miscdev; struct i2c_client *i2c_dev; - struct regulator_bulk_data regs[2]; + struct regulator_bulk_data regs[3]; enum pn544_state state; wait_queue_head_t read_wait; @@ -74,6 +74,7 @@ struct pn544_info { static const char reg_vdd_io[] = "Vdd_IO"; static const char reg_vbat[] = "VBat"; +static const char reg_vsim[] = "VSim"; /* sysfs interface */ static ssize_t pn544_test(struct device *dev, @@ -740,6 +741,7 @@ static int __devinit pn544_probe(struct i2c_client *client, info->regs[0].supply = reg_vdd_io; info->regs[1].supply = reg_vbat; + info->regs[2].supply = reg_vsim; r = regulator_bulk_get(&client->dev, ARRAY_SIZE(info->regs), info->regs); if (r < 0)