vserver 1.9.3

[linux-2.6.git] / drivers / ide / ide-proc.c

diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index a3ebd9e..07c989b 100644 (file)
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -360,27 +360,14 @@ static int proc_ide_read_identify
        int             err = 0;
 
        len = sprintf(page, "\n");
-       
-       if (drive)
-       {
+
+       if (drive) {
                unsigned short *val = (unsigned short *) page;
-               
-               /*
-                *      The current code can't handle a driverless
-                *      identify query taskfile. Now the right fix is
-                *      to add a 'default' driver but that is a bit
-                *      more work. 
-                *
-                *      FIXME: this has to be fixed for hotswap devices
-                */
-                
-               if(DRIVER(drive))
-                       err = taskfile_lib_get_identify(drive, page);
-               else    /* This relies on the ID changes */
-                       val = (unsigned short *)drive->id;
-
-               if(!err)
-               {                                               
+
+               BUG_ON(!drive->driver);
+
+               err = taskfile_lib_get_identify(drive, page);
+               if (!err) {
                        char *out = ((char *)page) + (SECTOR_WORDS * 4);
                        page = out;
                        do {