8 files changed, 67 insertions, 39 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 0a9f12c4e911..a3bfebcf31ef 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1257,25 +1257,28 @@ __dasd_start_head(struct dasd_device * device)
         if (list_empty(&device->ccw_queue))
                 return;
         cqr = list_entry(device->ccw_queue.next, struct dasd_ccw_req, list);
-        /* check FAILFAST */
+        if (cqr->status != DASD_CQR_QUEUED)
+                return;
+        /* Non-temporary stop condition will trigger fail fast */
         if (device->stopped & ~DASD_STOPPED_PENDING &&
             test_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags) &&
             (!dasd_eer_enabled(device))) {
                 cqr->status = DASD_CQR_FAILED;
                 dasd_schedule_bh(device);
+                return;
         }
-        if ((cqr->status == DASD_CQR_QUEUED) &&
-            (!device->stopped)) {
-                /* try to start the first I/O that can be started */
-                rc = device->discipline->start_IO(cqr);
-                if (rc == 0)
-                        dasd_set_timer(device, cqr->expires);
-                else if (rc == -EACCES) {
-                        dasd_schedule_bh(device);
-                } else
-                        /* Hmpf, try again in 1/2 sec */
-                        dasd_set_timer(device, 50);
-        }
+        /* Don't try to start requests if device is stopped */
+        if (device->stopped)
+                return;
+
+        rc = device->discipline->start_IO(cqr);
+        if (rc == 0)
+                dasd_set_timer(device, cqr->expires);
+        else if (rc == -EACCES) {
+                dasd_schedule_bh(device);
+        } else
+                /* Hmpf, try again in 1/2 sec */
+                dasd_set_timer(device, 50);
 }
 
 /*
@@ -1968,7 +1971,7 @@ int
 dasd_generic_set_offline (struct ccw_device *cdev)
 {
         struct dasd_device *device;
-        int max_count;
+        int max_count, open_count;
 
         device = dasd_device_from_cdev(cdev);
         if (IS_ERR(device))
@@ -1985,10 +1988,16 @@ dasd_generic_set_offline (struct ccw_device *cdev)
          * in the other openers.
          */
         max_count = device->bdev ? 0 : -1;
-        if (atomic_read(&device->open_count) > max_count) {
-                printk (KERN_WARNING "Can't offline dasd device with open"
-                        " count = %i.\n",
-                        atomic_read(&device->open_count));
+        open_count = (int) atomic_read(&device->open_count);
+        if (open_count > max_count) {
+                if (open_count > 0)
+                        printk (KERN_WARNING "Can't offline dasd device with "
+                                "open count = %i.\n",
+                                open_count);
+                else
+                        printk (KERN_WARNING "%s",
+                                "Can't offline dasd device due to internal "
+                                "use\n");
                 clear_bit(DASD_FLAG_OFFLINE, &device->flags);
                 dasd_put_device(device);
                 return -EBUSY;
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 1aa3c261718a..ad23aede356c 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -294,23 +294,40 @@ out_error:
 #endif                          /* CONFIG_DASD_PROFILE */
 }
 
+/*
+ * Create dasd proc-fs entries.
+ * In case creation failed, cleanup and return -ENOENT.
+ */
 int
 dasd_proc_init(void)
 {
         dasd_proc_root_entry = proc_mkdir("dasd", &proc_root);
+        if (!dasd_proc_root_entry)
+                goto out_nodasd;
         dasd_proc_root_entry->owner = THIS_MODULE;
         dasd_devices_entry = create_proc_entry("devices",
                                                S_IFREG | S_IRUGO | S_IWUSR,
                                                dasd_proc_root_entry);
+        if (!dasd_devices_entry)
+                goto out_nodevices;
         dasd_devices_entry->proc_fops = &dasd_devices_file_ops;
         dasd_devices_entry->owner = THIS_MODULE;
         dasd_statistics_entry = create_proc_entry("statistics",
                                                   S_IFREG | S_IRUGO | S_IWUSR,
                                                   dasd_proc_root_entry);
+        if (!dasd_statistics_entry)
+                goto out_nostatistics;
         dasd_statistics_entry->read_proc = dasd_statistics_read;
         dasd_statistics_entry->write_proc = dasd_statistics_write;
         dasd_statistics_entry->owner = THIS_MODULE;
         return 0;
+
+ out_nostatistics:
+        remove_proc_entry("devices", dasd_proc_root_entry);
+ out_nodevices:
+        remove_proc_entry("dasd", &proc_root);
+ out_nodasd:
+        return -ENOENT;
 }
 
 void
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index 6badd8403409..d4d2ff0a9da2 100644
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -54,7 +54,7 @@ kbd_alloc(void) {
         if (!kbd)
                 goto out;
         kbd->key_maps = kzalloc(sizeof(key_maps), GFP_KERNEL);
-        if (!key_maps)
+        if (!kbd->key_maps)
                 goto out_kbd;
         for (i = 0; i < ARRAY_SIZE(key_maps); i++) {
                 if (key_maps[i]) {
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 5c65cf3e5cc0..b70d92690242 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -432,8 +432,8 @@ tapeblock_ioctl(
 ) {
         int rc;
         int minor;
-        struct gendisk *disk = inode->i_bdev->bd_disk;
-        struct tape_device *device = disk->private_data;
+        struct gendisk *disk;
+        struct tape_device *device;
 
         rc     = 0;
         disk   = inode->i_bdev->bd_disk;
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 389ee2c0f443..e6e4086d3224 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -210,18 +210,14 @@ tape_state_set(struct tape_device *device, enum tape_state newstate)
                 return;
         }
         DBF_EVENT(4, "ts. dev:  %x\n", device->first_minor);
-        if (device->tape_state < TO_SIZE && device->tape_state >= 0)
-                str = tape_state_verbose[device->tape_state];
-        else
-                str = "UNKNOWN TS";
-        DBF_EVENT(4, "old ts:   %s\n", str);
-        if (device->tape_state < TO_SIZE && device->tape_state >=0 )
+        DBF_EVENT(4, "old ts:\t\n");
+        if (device->tape_state < TS_SIZE && device->tape_state >=0 )
                 str = tape_state_verbose[device->tape_state];
         else
                 str = "UNKNOWN TS";
         DBF_EVENT(4, "%s\n", str);
         DBF_EVENT(4, "new ts:\t\n");
-        if (newstate < TO_SIZE && newstate >= 0)
+        if (newstate < TS_SIZE && newstate >= 0)
                 str = tape_state_verbose[newstate];
         else
                 str = "UNKNOWN TS";
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index cb8e2e672b68..0960bef7b199 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -414,11 +414,11 @@ cio_ignore_proc_init (void)
         entry = create_proc_entry ("cio_ignore", S_IFREG | S_IRUGO | S_IWUSR,
                                    &proc_root);
         if (!entry)
-                return 0;
+                return -ENOENT;
 
         entry->proc_fops = &cio_ignore_proc_fops;
 
-        return 1;
+        return 0;
 }
 
 __initcall (cio_ignore_proc_init);
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index cbb86fa5f293..5b20d8c9c025 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -67,7 +67,7 @@ cio_debug_init (void)
                 goto out_unregister;
         debug_register_view (cio_debug_msg_id, &debug_sprintf_view);
         debug_set_level (cio_debug_msg_id, 2);
-        cio_debug_trace_id = debug_register ("cio_trace", 16, 4, 8);
+        cio_debug_trace_id = debug_register ("cio_trace", 16, 4, 16);
         if (!cio_debug_trace_id)
                 goto out_unregister;
         debug_register_view (cio_debug_trace_id, &debug_hex_ascii_view);
diff --git a/drivers/s390/cio/cio_debug.h b/drivers/s390/cio/cio_debug.h
index 6af8b27d366b..f88844adae1b 100644
--- a/drivers/s390/cio/cio_debug.h
+++ b/drivers/s390/cio/cio_debug.h
@@ -3,6 +3,11 @@
 
 #include <asm/debug.h>
 
+/* for use of debug feature */
+extern debug_info_t *cio_debug_msg_id;
+extern debug_info_t *cio_debug_trace_id;
+extern debug_info_t *cio_debug_crw_id;
+
 #define CIO_TRACE_EVENT(imp, txt) do { \
                 debug_text_event(cio_debug_trace_id, imp, txt); \
         } while (0)
@@ -15,18 +20,19 @@
                 debug_sprintf_event(cio_debug_crw_id, imp , ##args); \
         } while (0)
 
-#define CIO_HEX_EVENT(imp, args...) do { \
-                debug_event(cio_debug_trace_id, imp, ##args); \
-        } while (0)
+static inline void
+CIO_HEX_EVENT(int level, void *data, int length)
+{
+        while (length > 0) {
+                debug_event(cio_debug_trace_id, level, data, length);
+                length -= cio_debug_trace_id->buf_size;
+                data += cio_debug_trace_id->buf_size;
+        }
+}
 
 #define CIO_DEBUG(printk_level,event_level,msg...) ({ \
         if (cio_show_msg) printk(printk_level msg); \
         CIO_MSG_EVENT (event_level, msg); \
 })
 
-/* for use of debug feature */
-extern debug_info_t *cio_debug_msg_id;
-extern debug_info_t *cio_debug_trace_id;
-extern debug_info_t *cio_debug_crw_id;
-
 #endif