ide-disk: set_addressing() fixes

* Return -EIO if arg > 0 and LBA48 is unsupported.

* No need to reset ->addressing.

* Make ->addressing a single bit flag.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 6 insertions, 7 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 01846f244b40..65c499aab664 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -686,14 +686,13 @@ static int set_addressing(ide_drive_t *drive, int arg)
         if (arg < 0 || arg > 2)
                 return -EINVAL;
 
-        drive->addressing =  0;
-
-        if (drive->hwif->host_flags & IDE_HFLAG_NO_LBA48)
-                return 0;
-
-        if (ata_id_lba48_enabled(drive->id) == 0)
+        if (arg && ((drive->hwif->host_flags & IDE_HFLAG_NO_LBA48) ||
+            ata_id_lba48_enabled(drive->id) == 0))
                 return -EIO;
 
+        if (arg == 2)
+                arg = 0;
+
         drive->addressing = arg;
 
         return 0;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 02c4c642e6a5..90d53c99fe92 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -509,7 +509,7 @@ struct ide_drive_s {
         unsigned sleeping       : 1;    /* 1=sleeping & sleep field valid */
         unsigned post_reset     : 1;
         unsigned udma33_warned  : 1;
-        unsigned addressing     : 2;    /* 0=28-bit, 1=48-bit, 2=48-bit doing 28-bit */
+        unsigned addressing     : 1;    /* 0=28-bit, 1=48-bit */
         unsigned wcache         : 1;    /* status of write cache */
         unsigned nowerr         : 1;    /* used for ignoring ATA_DF */