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

Commit a8b76b49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

parents 637029c6 c3c013a2

drivers/scsi/libata-core.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -82,6 +82,10 @@ int atapi_enabled = 0; 
module_param(atapi_enabled, int, 0444);

module_param(atapi_enabled, int, 0444);

MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");

MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");





int libata_fua = 0;

module_param_named(fua, libata_fua, int, 0444);

MODULE_PARM_DESC(fua, "FUA support (0=off, 1=on)");



MODULE_AUTHOR("Jeff Garzik");

MODULE_AUTHOR("Jeff Garzik");

MODULE_DESCRIPTION("Library module for ATA devices");

MODULE_DESCRIPTION("Library module for ATA devices");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

drivers/scsi/libata-scsi.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1708,6 +1708,8 @@ static int ata_dev_supports_fua(u16 *id) 
{

{

	unsigned char model[41], fw[9];

	unsigned char model[41], fw[9];





	if (!libata_fua)

		return 0;

	if (!ata_id_has_fua(id))

	if (!ata_id_has_fua(id))

		return 0;

		return 0;

drivers/scsi/libata.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ struct ata_scsi_args { 




/* libata-core.c */

/* libata-core.c */

extern int atapi_enabled;

extern int atapi_enabled;

extern int libata_fua;

extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,

extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,

				      struct ata_device *dev);

				      struct ata_device *dev);

extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc);

extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc);