2 files changed, 7 insertions, 8 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 7e959f90c020..e417e1a1d02c 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -675,19 +675,18 @@ static int ata_ioc32(struct ata_port *ap)
 int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *scsidev,
                      int cmd, void __user *arg)
 {
-        int val = -EINVAL, rc = -EINVAL;
+        unsigned long val;
+        int rc = -EINVAL;
         unsigned long flags;
 
         switch (cmd) {
-        case ATA_IOC_GET_IO32:
+        case HDIO_GET_32BIT:
                 spin_lock_irqsave(ap->lock, flags);
                 val = ata_ioc32(ap);
                 spin_unlock_irqrestore(ap->lock, flags);
-                if (copy_to_user(arg, &val, 1))
-                        return -EFAULT;
-                return 0;
+                return put_user(val, (unsigned long __user *)arg);
 
-        case ATA_IOC_SET_IO32:
+        case HDIO_SET_32BIT:
                 val = (unsigned long) arg;
                 rc = 0;
                 spin_lock_irqsave(ap->lock, flags);
diff --git a/include/linux/ata.h b/include/linux/ata.h
index d2992bfa1706..c1a2f345cbe6 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -487,8 +487,8 @@ enum ata_tf_protocols {
 };
 
 enum ata_ioctls {
-        ATA_IOC_GET_IO32        = 0x309,
-        ATA_IOC_SET_IO32        = 0x324,
+        ATA_IOC_GET_IO32        = 0x309, /* HDIO_GET_32BIT */
+        ATA_IOC_SET_IO32        = 0x324, /* HDIO_SET_32BIT */
 };
 
 /* core structures */