From 0190f8913ae5295527e79b32d4d7dcd55ecdfe30 Mon Sep 17 00:00:00 2001 From: Brian King Date: Thu, 23 Mar 2006 17:30:08 -0600 Subject: [PATCH] --- yaml --- r: 23493 b: refs/heads/master c: 2af10a818de1658f818601c7098056d65a772bc5 h: refs/heads/master i: 23491: 807b3f9f7099e65711d123eae2f3394b5da1b49b v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-scsi.c | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 5b40d03bbde7..6bc5fed96a58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb3f0f9c6c3416016565c8b91644d7386889e565 +refs/heads/master: 2af10a818de1658f818601c7098056d65a772bc5 diff --git a/trunk/drivers/scsi/libata-scsi.c b/trunk/drivers/scsi/libata-scsi.c index 8192ddd62974..628191bfd990 100644 --- a/trunk/drivers/scsi/libata-scsi.c +++ b/trunk/drivers/scsi/libata-scsi.c @@ -267,20 +267,8 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg) { - struct ata_port *ap; - struct ata_device *dev; int val = -EINVAL, rc = -EINVAL; - ap = (struct ata_port *) &scsidev->host->hostdata[0]; - if (!ap) - goto out; - - dev = ata_scsi_find_dev(ap, scsidev); - if (!dev) { - rc = -ENODEV; - goto out; - } - switch (cmd) { case ATA_IOC_GET_IO32: val = 0; @@ -309,7 +297,6 @@ int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg) break; } -out: return rc; }