1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 3fdab563fec2..59fe358048b3 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -726,6 +726,7 @@ void ide_setup_ports (	hw_regs_t *hw,
 {
         int i;
 
+        memset(hw, 0, sizeof(hw_regs_t));
         for (i = 0; i < IDE_NR_PORTS; i++) {
                 if (offsets[i] == -1) {
                         switch(i) {
@@ -1225,7 +1226,7 @@ static int generic_ide_suspend(struct device *dev, pm_message_t state)
         memset(&args, 0, sizeof(args));
         rq.flags = REQ_PM_SUSPEND;
         rq.special = &args;
-        rq.pm = &rqpm;
+        rq.end_io_data = &rqpm;
         rqpm.pm_step = ide_pm_state_start_suspend;
         rqpm.pm_state = state.event;
 
@@ -1244,7 +1245,7 @@ static int generic_ide_resume(struct device *dev)
         memset(&args, 0, sizeof(args));
         rq.flags = REQ_PM_RESUME;
         rq.special = &args;
-        rq.pm = &rqpm;
+        rq.end_io_data = &rqpm;
         rqpm.pm_step = ide_pm_state_start_resume;
         rqpm.pm_state = PM_EVENT_ON;
 
@@ -1366,8 +1367,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
 
                         ide_abort(drive, "drive reset");
 
-                        if(HWGROUP(drive)->handler)
-                                BUG();
+                        BUG_ON(HWGROUP(drive)->handler);
                                 
                         /* Ensure nothing gets queued after we
                            drop the lock. Reset will clear the busy */