diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-17 06:25:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-17 06:25:43 -0400 |
| commit | 0f1f6dec9593c8319714c927dafb443548a1452a (patch) | |
| tree | 74f887dc86747523e82f08900501073f451996cc /drivers/i2c/i2c-dev.c | |
| parent | 8cd162ce230b154e564a1285bb5f89fcf73f0dce (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'drivers/i2c/i2c-dev.c')
| -rw-r--r-- | drivers/i2c/i2c-dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index 307d976c9b69..c171988a9f51 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c | |||
| @@ -521,9 +521,9 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap) | |||
| 521 | return PTR_ERR(i2c_dev); | 521 | return PTR_ERR(i2c_dev); |
| 522 | 522 | ||
| 523 | /* register this i2c device with the driver core */ | 523 | /* register this i2c device with the driver core */ |
| 524 | i2c_dev->dev = device_create_drvdata(i2c_dev_class, &adap->dev, | 524 | i2c_dev->dev = device_create(i2c_dev_class, &adap->dev, |
| 525 | MKDEV(I2C_MAJOR, adap->nr), | 525 | MKDEV(I2C_MAJOR, adap->nr), NULL, |
| 526 | NULL, "i2c-%d", adap->nr); | 526 | "i2c-%d", adap->nr); |
| 527 | if (IS_ERR(i2c_dev->dev)) { | 527 | if (IS_ERR(i2c_dev->dev)) { |
| 528 | res = PTR_ERR(i2c_dev->dev); | 528 | res = PTR_ERR(i2c_dev->dev); |
| 529 | goto error; | 529 | goto error; |