Merge branches 'acpi-fan', 'acpi-video' and 'acpi-ec'

[cascardo/linux.git] / drivers / scsi / sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 95bfb7b..fedab3c 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -510,9 +510,9 @@ static const struct dev_pm_ops sd_pm_ops = {
 };
 
 static struct scsi_driver sd_template = {
-       .owner                  = THIS_MODULE,
        .gendrv = {
                .name           = "sd",
+               .owner          = THIS_MODULE,
                .probe          = sd_probe,
                .remove         = sd_remove,
                .shutdown       = sd_shutdown,
@@ -786,7 +786,7 @@ static int sd_setup_discard_cmnd(struct scsi_cmnd *cmd)
         * amount of blocks described by the request.
         */
        blk_add_request_payload(rq, page, len);
-       ret = scsi_init_io(cmd, GFP_ATOMIC);
+       ret = scsi_init_io(cmd);
        rq->__data_len = nr_bytes;
 
 out:
@@ -880,7 +880,7 @@ static int sd_setup_write_same_cmnd(struct scsi_cmnd *cmd)
         * knows how much to actually write.
         */
        rq->__data_len = sdp->sector_size;
-       ret = scsi_init_io(cmd, GFP_ATOMIC);
+       ret = scsi_init_io(cmd);
        rq->__data_len = nr_bytes;
        return ret;
 }
@@ -914,7 +914,7 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt)
        int ret;
        unsigned char protect;
 
-       ret = scsi_init_io(SCpnt, GFP_ATOMIC);
+       ret = scsi_init_io(SCpnt);
        if (ret != BLKPREP_OK)
                goto out;
        SCpnt = rq->special;
@@ -1982,7 +1982,7 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
 
        do {
                memset(cmd, 0, 16);
-               cmd[0] = SERVICE_ACTION_IN;
+               cmd[0] = SERVICE_ACTION_IN_16;
                cmd[1] = SAI_READ_CAPACITY_16;
                cmd[13] = RC16_LEN;
                memset(buffer, 0, RC16_LEN);