NFSv4.1 reclaim complete must wait for completion

[mv-sheeva.git] / drivers / nfc / pn544.c

diff --git a/drivers/nfc/pn544.c b/drivers/nfc/pn544.c
index 401c44b6eadb8220c726bb6511cf8ae8bca15000..724f65d8f9e4aa5deed5dcba2a6451f5b1b58d0b 100644 (file)
--- a/drivers/nfc/pn544.c
+++ b/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;
@@ -69,11 +69,12 @@ struct pn544_info {
        struct mutex read_mutex; /* Serialize read_irq access */
        struct mutex mutex; /* Serialize info struct access */
        u8 *buf;
-       unsigned int buflen;
+       size_t buflen;
 };
 
 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)