diff options
| author | Gerald Schaefer <gerald.schaefer@de.ibm.com> | 2009-06-12 10:26:35 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-06-12 10:27:34 +0200 |
| commit | d0591485e15ccd908f91058f7da134248dcdbbb3 (patch) | |
| tree | b4964e3911455edeff310bdd456ba85f64de9b82 | |
| parent | 6b9d8e80bb9edd0c9fe948a6ef105391de56b012 (diff) | |
| download | kernel-crypto-d0591485e15ccd908f91058f7da134248dcdbbb3.tar.gz kernel-crypto-d0591485e15ccd908f91058f7da134248dcdbbb3.tar.xz kernel-crypto-d0591485e15ccd908f91058f7da134248dcdbbb3.zip | |
[S390] dcssblk: revert devt conversion
git commit f331c0296f2a9fee0d396a70598b954062603015 changed users of
->first_minor to devt. This broke device handling in dcssblk, so that
no additional devices could be added after the first one.
This patch reverts the devt conversion to the previous ->first_minor
handling.
Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | drivers/s390/block/dcssblk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index a4c7ffcd998..b21caf177e3 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c @@ -127,7 +127,7 @@ dcssblk_assign_free_minor(struct dcssblk_dev_info *dev_info) found = 0; // test if minor available list_for_each_entry(entry, &dcssblk_devices, lh) - if (minor == MINOR(disk_devt(entry->gd))) + if (minor == entry->gd->first_minor) found++; if (!found) break; // got unused minor } @@ -625,7 +625,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char if (rc) goto release_gd; sprintf(dev_info->gd->disk_name, "dcssblk%d", - MINOR(disk_devt(dev_info->gd))); + dev_info->gd->first_minor); list_add_tail(&dev_info->lh, &dcssblk_devices); if (!try_module_get(THIS_MODULE)) { |