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

Commit 0a09d9a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  Doc Fix: remove mention of combined mode-related kernel parameters
  libata: fix kernel-doc parameters
  Fix pata_qdi.c probe code
  pata_scc: fix compilation
  sata_via: add missing PM hooks
  sata_nv: fix ADMA freeze/thaw/irq_clear issues
  pata_pcmcia.c: add card ident for jvc cdrom
  sata_promise: SATAII-150/300 TX4 port numbering fix
  sata_promise: fix another error decode regression
  libata-acpi: fix _GTF command protocol for ATAPI devices
parents 44ce6294 e0863397

Documentation/kernel-parameters.txt

+0 −8
Original line number Diff line number Diff line
@@ -754,14 +754,6 @@ and is between 256 and 4096 characters. It is defined in the file 
	inport.irq=	[HW] Inport (ATI XL and Microsoft) busmouse driver

			Format: <irq>



	combined_mode=	[HW] control which driver uses IDE ports in combined

			mode: legacy IDE driver, libata, or both

			(in the libata case, libata.atapi_enabled=1 may be

			useful as well).  Note that using the ide or libata

			options may affect your device naming (e.g. by

			changing hdc to sdb).

			Format: combined (default), ide, or libata



	inttest=	[IA64]



	io7=		[HW] IO7 for Marvel based alpha systems

drivers/ata/libata-acpi.c

+1 −2
Original line number Diff line number Diff line
@@ -489,8 +489,7 @@ static void taskfile_load_raw(struct ata_port *ap, 


	/* convert gtf to tf */

	tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; /* TBD */

	tf.protocol = atadev->class == ATA_DEV_ATAPI ?

		ATA_PROT_ATAPI_NODATA : ATA_PROT_NODATA;

	tf.protocol = ATA_PROT_NODATA;

	tf.feature = gtf->tfa[0];	/* 0x1f1 */

	tf.nsect   = gtf->tfa[1];	/* 0x1f2 */

	tf.lbal    = gtf->tfa[2];	/* 0x1f3 */

drivers/ata/libata-core.c

+2 −0
Original line number Diff line number Diff line
@@ -895,6 +895,7 @@ static u64 ata_read_native_max_address(struct ata_device *dev) 
/**

 *	ata_set_native_max_address_ext	-	LBA48 native max set

 *	@dev: Device to query

 *	@new_sectors: new max sectors value to set for the device

 *

 *	Perform an LBA48 size set max upon the device in question. Return the

 *	actual LBA48 size or zero if the command fails.
@@ -932,6 +933,7 @@ static u64 ata_set_native_max_address_ext(struct ata_device *dev, u64 new_sector 
/**

 *	ata_set_native_max_address	-	LBA28 native max set

 *	@dev: Device to query

 *	@new_sectors: new max sectors value to set for the device

 *

 *	Perform an LBA28 size set max upon the device in question. Return the

 *	actual LBA28 size or zero if the command fails.

drivers/ata/pata_pcmcia.c

+1 −0
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ static struct pcmcia_device_id pcmcia_devices[] = { 
	PCMCIA_DEVICE_MANF_CARD(0x000a, 0x0000),	/* I-O Data CFA */

	PCMCIA_DEVICE_MANF_CARD(0x001c, 0x0001),	/* Mitsubishi CFA */

	PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704),

	PCMCIA_DEVICE_MANF_CARD(0x0032, 0x2904),

	PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401),	/* SanDisk CFA */

	PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000),	/* Toshiba */

	PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d),

drivers/ata/pata_qdi.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static __init int qdi_init(void) 
				res = inb(port + 3);

				if (res & 1) {

					/* Single channel mode */

					if (qdi_init_one(port, 6580, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04))

					if (qdi_init_one(port, 6580, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04) == 0)

						ct++;

				} else {

					/* Dual channel mode */