aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-27 13:54:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-27 13:54:43 -0700
commit72e19b3b22f43b20ee84db0deba33c71803cbe34 (patch)
tree2ca2ad35d0f01b0a808991ca3749060f8c382b24 /drivers
parentf42ac38c59e0a03d6da0c24a63fb211393f484b0 (diff)
parentdbe13d9981e55c60a030d0509acc9a8968b9c5bf (diff)
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] dcss: fix build bug. [S390] Fix linker script.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/s390/block/dcssblk.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index db85f1fb131..711b3004b3e 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -384,9 +384,10 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
* get minor, add to list
*/
down_write(&dcssblk_devices_sem);
- if (dcssblk_get_segment_by_name(local_buf)) {
+ if (dcssblk_get_device_by_name(local_buf)) {
+ up_write(&dcssblk_devices_sem);
rc = -EEXIST;
- goto release_gd;
+ goto unload_seg;
}
rc = dcssblk_assign_free_minor(dev_info);
if (rc) {