The patch titled
drivers/nfc/pn544.c: add missing regulator
has been added to the -mm tree. Its filename is
drivers-nfc-pn544c-add-missing-regulator.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: drivers/nfc/pn544.c: add missing regulator
From: "Matti J. Aaltonen" <matti.j.aaltonen@xxxxxxxxx>
Add regulator VSim to the regulator array.
Signed-off-by: Matti J. Aaltonen <matti.j.aaltonen@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/nfc/pn544.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -puN drivers/nfc/pn544.c~drivers-nfc-pn544c-add-missing-regulator drivers/nfc/pn544.c
--- a/drivers/nfc/pn544.c~drivers-nfc-pn544c-add-missing-regulator
+++ a/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
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)
_
Patches currently in -mm which might be from matti.j.aaltonen@xxxxxxxxx are
drivers-nfc-kconfig-use-full-form-of-the-nfc-acronym.patch
drivers-nfc-pn544c-add-missing-regulator.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
