Commit 9a4c8546 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide-cd: fix missing residual count setting in DMA mode
  ht6560b: force prefetch for some devices
  ht6560b can only do up to PIO mode 4
  linux/hdsmart.h: fix goofups (take 2)
  via82cxxx: add new PCI id for cx700
  falconide: locking bugfix
  MAINTAINERS: update ide-cd maintainer's email address
  ide/libata: ST310211A has buggy HPA too
  ide: Add missing base addresses for falconide and macide
parents b0abcfc1 14e04c3f

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1924,7 +1924,7 @@ S: Maintained 


IDE/ATAPI CDROM DRIVER

P:	Borislav Petkov

M:	bbpetkov@yahoo.de

M:	petkovbb@gmail.com

L:	linux-ide@vger.kernel.org

S:	Maintained

drivers/ata/libata-core.c

+1 −0
Original line number Diff line number Diff line
@@ -4190,6 +4190,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	/* Devices which report 1 sector over size HPA */

	{ "ST340823A",		NULL,		ATA_HORKAGE_HPA_SIZE, },

	{ "ST320413A",		NULL,		ATA_HORKAGE_HPA_SIZE, },

	{ "ST310211A",		NULL,		ATA_HORKAGE_HPA_SIZE, },



	/* Devices which get the IVB wrong */

	{ "QUANTUM FIREBALLlct10 05", "A03.0900", ATA_HORKAGE_IVB, },

drivers/ide/ide-cd.c

+5 −1
Original line number Diff line number Diff line
@@ -1207,9 +1207,13 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) 
end_request:

	if (blk_pc_request(rq)) {

		unsigned long flags;

		unsigned int dlen = rq->data_len;



		if (dma)

			rq->data_len = 0;



		spin_lock_irqsave(&ide_lock, flags);

		if (__blk_end_request(rq, 0, rq->data_len))

		if (__blk_end_request(rq, 0, dlen))

			BUG();

		HWGROUP(drive)->rq = NULL;

		spin_unlock_irqrestore(&ide_lock, flags);

drivers/ide/ide-disk.c

+1 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ static inline int idedisk_supports_lba48(const struct hd_driveid *id) 
static const struct drive_list_entry hpa_list[] = {

	{ "ST340823A",	NULL },

	{ "ST320413A",	NULL },

	{ "ST310211A",	NULL },

	{ NULL,		NULL }

};

drivers/ide/ide-generic.c

+0 −6
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ static int __init ide_generic_init(void) 
	u8 idx[MAX_HWIFS];

	int i;



	if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])

		ide_get_lock(NULL, NULL); /* for atari only */



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

		ide_hwif_t *hwif = &ide_hwifs[i];
@@ -31,9 +28,6 @@ static int __init ide_generic_init(void) 


	ide_device_add_all(idx, NULL);



	if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])

		ide_release_lock();	/* for atari only */



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE