Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 643736a5 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'scsi-scan'

parents 9d5b1302 3f19ee8c

drivers/scsi/libata-core.c

+1 −1
Original line number Diff line number Diff line
@@ -4203,7 +4203,7 @@ int ata_device_add(struct ata_probe_ent *ent) 
	for (i = 0; i < count; i++) {

		struct ata_port *ap = host_set->ports[i];



		scsi_scan_host(ap->host);

		ata_scsi_scan_host(ap);

	}



	dev_set_drvdata(dev, host_set);

drivers/scsi/libata-scsi.c

+16 −0
Original line number Diff line number Diff line
@@ -1816,3 +1816,19 @@ void ata_scsi_simulate(u16 *id, 
	}

}



void ata_scsi_scan_host(struct ata_port *ap)

{

	struct ata_device *dev;

	unsigned int i;



	if (ap->flags & ATA_FLAG_PORT_DISABLED)

		return;



	for (i = 0; i < ATA_MAX_DEVICES; i++) {

		dev = &ap->device[i];



		if (ata_dev_present(dev))

			scsi_scan_target(&ap->host->shost_gendev, 0, i, 0, 0);

	}

}

drivers/scsi/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ extern void swap_buf_le16(u16 *buf, unsigned int buf_words); 




/* libata-scsi.c */

extern void ata_scsi_scan_host(struct ata_port *ap);

extern void ata_to_sense_error(struct ata_queued_cmd *qc, u8 drv_stat);

extern int ata_scsi_error(struct Scsi_Host *host);

extern unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf,