diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-24 08:09:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-24 08:09:26 +0200 |
| commit | 28afe961a18f77b2249062499bdbf70fd2ec6bba (patch) | |
| tree | 71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /drivers/s390/char/tape_class.c | |
| parent | 1e01cb0c6ff7e9ddb6547551794c6aa82785a7cb (diff) | |
| parent | 338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff) | |
| download | op-kernel-dev-28afe961a18f77b2249062499bdbf70fd2ec6bba.zip op-kernel-dev-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.gz | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'drivers/s390/char/tape_class.c')
| -rw-r--r-- | drivers/s390/char/tape_class.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c index 6dfdb7c..12c2a5a 100644 --- a/drivers/s390/char/tape_class.c +++ b/drivers/s390/char/tape_class.c @@ -69,10 +69,9 @@ struct tape_class_device *register_tape_dev( if (rc) goto fail_with_cdev; - tcd->class_device = device_create(tape_class, device, - tcd->char_device->dev, - "%s", tcd->device_name - ); + tcd->class_device = device_create_drvdata(tape_class, device, + tcd->char_device->dev, + NULL, "%s", tcd->device_name); rc = IS_ERR(tcd->class_device) ? PTR_ERR(tcd->class_device) : 0; if (rc) goto fail_with_cdev; |
