diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:43:15 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:43:15 +0100 |
| commit | 36a886a9f701d0dc7a6168dcc972e331dd9b6792 (patch) | |
| tree | 5696080fdd636e8be1a1054ff0e802b3c3926074 | |
| parent | 116c24e99e658dfe84b7d843f445e04de840e247 (diff) | |
| parent | ab9c2ed94e2b88b1787ad5e92e6506e105886f0b (diff) | |
| download | barebox-36a886a9f701d0dc7a6168dcc972e331dd9b6792.tar.gz barebox-36a886a9f701d0dc7a6168dcc972e331dd9b6792.tar.xz | |
Merge branch 'for-next/mfd'
| -rw-r--r-- | drivers/mfd/stmpe-i2c.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c index 3c2017ebe4..9e4bbcccf1 100644 --- a/drivers/mfd/stmpe-i2c.c +++ b/drivers/mfd/stmpe-i2c.c @@ -118,7 +118,8 @@ static int stmpe_probe(struct device_d *dev) } stmpe_dev = xzalloc(sizeof(struct stmpe)); - stmpe_dev->cdev.name = DRIVERNAME; + stmpe_dev->cdev.name = asprintf(DRIVERNAME "%d", + cdev_find_free_index(DRIVERNAME)); stmpe_dev->client = to_i2c_client(dev); stmpe_dev->cdev.size = 191; /* 191 known registers */ stmpe_dev->cdev.dev = dev; |