1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index a1179e924962..adbe9f76a505 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -82,7 +82,6 @@
 
 #define IDEFLOPPY_VERSION "0.99.newide"
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/string.h>
@@ -839,7 +838,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
                         "transferred\n", pc->actually_transferred);
                 clear_bit(PC_DMA_IN_PROGRESS, &pc->flags);
 
-                local_irq_enable();
+                local_irq_enable_in_hardirq();
 
                 if (status.b.check || test_bit(PC_DMA_ERROR, &pc->flags)) {
                         /* Error detected */
@@ -1284,7 +1283,7 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request
 
         debug_log(KERN_INFO "rq_status: %d, dev: %s, flags: %lx, errors: %d\n",
                         rq->rq_status,
-                        rq->rq_disk ? rq->rq_disk->disk_name ? "?",
+                        rq->rq_disk ? rq->rq_disk->disk_name : "?",
                         rq->flags, rq->errors);
         debug_log(KERN_INFO "sector: %ld, nr_sectors: %ld, "
                         "current_nr_sectors: %d\n", (long)rq->sector,
@@ -2176,7 +2175,6 @@ static int ide_floppy_probe(ide_drive_t *drive)
 
         g->minors = 1 << PARTN_BITS;
         g->driverfs_dev = &drive->gendev;
-        strcpy(g->devfs_name, drive->devfs_name);
         g->flags = drive->removable ? GENHD_FL_REMOVABLE : 0;
         g->fops = &idefloppy_ops;
         drive->attach = 1;