diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
| commit | 8ce7a9c159c8c4eb480f0a65c6af753dbf9a1a70 (patch) | |
| tree | be59573c0af3617d0cd8a7d61f0ed119e58b1156 /drivers/s390/char/tape_class.c | |
| parent | d2afb3ae04e36dbc6e9eb2d8bd54406ff7b6b3bd (diff) | |
| parent | 01da5fd83d6b2c5e36b77539f6cbdd8f49849225 (diff) | |
Merge ../linux-2.6
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( |