xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source
This commit is contained in:
Jeff Garzik
2005-10-30 23:33:54 -05:00
parent 024b143271 005a5a06a6
commit c4811b151b
3 changed files with 18 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/scsi/libata-scsi.c
View File

@@ -39,6 +39,7 @@
#include <scsi/scsi.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <scsi/scsi_device.h>
#include <linux/libata.h>
#include <linux/hdreg.h>
#include <asm/uaccess.h>
@@ -2399,8 +2400,12 @@ int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
struct ata_port *ap;
struct ata_device *dev;
struct scsi_device *scsidev = cmd->device;
struct Scsi_Host *shost = scsidev->host;
ap = (struct ata_port *) &scsidev->host->hostdata[0];
ap = (struct ata_port *) &shost->hostdata[0];
spin_unlock(shost->host_lock);
spin_lock(&ap->host_set->lock);
ata_scsi_dump_cdb(ap, cmd);
@@ -2423,6 +2428,8 @@ int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
ata_scsi_translate(ap, dev, cmd, done, atapi_xlat);
out_unlock:
spin_unlock(&ap->host_set->lock);
spin_lock(shost->host_lock);
return 0;
}