Message ID | 1348772644-12486-2-git-send-email-gwendal@google.com |
---|---|
State | Not Applicable |
Delegated to: | David Miller |
Headers | show |
Hello. On 27-09-2012 21:04, Gwendal Grignou wrote: > This reverts commit 9a6d6a2ddabbd32c07f6a38b659e5f3db319fa5a. > > Instead, melt libata transport sysfs object in scsi objects. > > Change-Id: I8c709f63ddf7ba97b9e6f449d5c0b8b85e44e818 Remove this line please, it has no place in the upstream commit. > Signed-off-by: Gwendal Grignou<gwendal@google.com> > MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index e3bda07..be38930 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -3609,7 +3609,7 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht) shost->max_host_blocked = 1; rc = scsi_add_host_with_dma(ap->scsi_host, - &ap->tdev, ap->host->dev); + host->dev, host->dev); if (rc) goto err_add; }
This reverts commit 9a6d6a2ddabbd32c07f6a38b659e5f3db319fa5a. Instead, melt libata transport sysfs object in scsi objects. Change-Id: I8c709f63ddf7ba97b9e6f449d5c0b8b85e44e818 Signed-off-by: Gwendal Grignou <gwendal@google.com> --- drivers/ata/libata-scsi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)