diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
| commit | 5615ca7906aefbdc3318604c89db5931d0a25910 (patch) | |
| tree | c34bcc7e314f49005ad88ac84c908128729c0329 /drivers/scsi/osst.c | |
| parent | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (diff) | |
| parent | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/osst.c')
| -rw-r--r-- | drivers/scsi/osst.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index af1133104b3f..172839fce0eb 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c | |||
| @@ -5629,7 +5629,7 @@ static void osst_sysfs_add(dev_t dev, struct device *device, struct osst_tape * | |||
| 5629 | 5629 | ||
| 5630 | if (!osst_sysfs_valid) return; | 5630 | if (!osst_sysfs_valid) return; |
| 5631 | 5631 | ||
| 5632 | osst_class_member = class_device_create(osst_sysfs_class, dev, device, "%s", name); | 5632 | osst_class_member = class_device_create(osst_sysfs_class, NULL, dev, device, "%s", name); |
| 5633 | if (IS_ERR(osst_class_member)) { | 5633 | if (IS_ERR(osst_class_member)) { |
| 5634 | printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name); | 5634 | printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name); |
| 5635 | return; | 5635 | return; |