diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
| commit | 83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18 (patch) | |
| tree | 5ba3bbbe977c2047658b41e22d6b2abd5686bf15 /drivers/s390/char/tape_class.c | |
| parent | 8638460540749ddb1beca9e9a68d655a6fe6df65 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/s390/char/tape_class.c')
| -rw-r--r-- | drivers/s390/char/tape_class.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c index 643b6d078563..56b87618b100 100644 --- a/drivers/s390/char/tape_class.c +++ b/drivers/s390/char/tape_class.c | |||
| @@ -76,7 +76,7 @@ struct tape_class_device *register_tape_dev( | |||
| 76 | device, | 76 | device, |
| 77 | "%s", tcd->device_name | 77 | "%s", tcd->device_name |
| 78 | ); | 78 | ); |
| 79 | rc = PTR_ERR(tcd->class_device); | 79 | rc = IS_ERR(tcd->class_device) ? PTR_ERR(tcd->class_device) : 0; |
| 80 | if (rc) | 80 | if (rc) |
| 81 | goto fail_with_cdev; | 81 | goto fail_with_cdev; |
| 82 | rc = sysfs_create_link( | 82 | rc = sysfs_create_link( |