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

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

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

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: ide_scan_pcibus(): check __pci_register_driver return value
  ide: pdc202xx_new PLL input clock fix
  it821x: fix incorrect SWDMA mask
  amd74xx: resume fix
  hpt366: use correct enablebits for HPT36x
  hpt366: blacklist MAXTOR STM3320620A for UltraDMA/66
  ide: Fix a theoretical Ooops case
  ide: never called printk statement in ide-taskfile.c::wait_drive_not_busy
parents f744a054 d61bcce9

drivers/ide/ide-probe.c

+2 −2
Original line number Diff line number Diff line
@@ -574,11 +574,11 @@ static inline u8 probe_for_drive (ide_drive_t *drive) 
			/* look for ATAPI device */

			(void) do_probe(drive, WIN_PIDENTIFY);

		}

		if (strstr(drive->id->model, "E X A B Y T E N E S T"))

			enable_nest(drive);

		if (!drive->present)

			/* drive not found */

			return 0;

		if (strstr(drive->id->model, "E X A B Y T E N E S T"))

			enable_nest(drive);

	

		/* identification failed? */

		if (!drive->id_read) {

drivers/ide/ide-taskfile.c

+8 −4
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ EXPORT_SYMBOL(task_no_data_intr); 
static u8 wait_drive_not_busy(ide_drive_t *drive)

{

	ide_hwif_t *hwif = HWIF(drive);

	int retries = 100;

	int retries;

	u8 stat;



	/*
@@ -246,10 +246,14 @@ static u8 wait_drive_not_busy(ide_drive_t *drive) 
	 * This can take up to 10 usec, but we will wait max 1 ms

	 * (drive_cmd_intr() waits that long).

	 */

	while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--)

	for (retries = 0; retries < 100; retries++) {

		if ((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT)

			udelay(10);

		else

			break;

	}



	if (!retries)

	if (stat & BUSY_STAT)

		printk(KERN_ERR "%s: drive still BUSY!\n", drive->name);



	return stat;

drivers/ide/pci/amd74xx.c

+3 −5
Original line number Diff line number Diff line 
/*

 * Version 2.15

 * Version 2.16

 *

 * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04

 * IDE driver for Linux.
@@ -244,10 +244,8 @@ static int amd_set_drive(ide_drive_t *drive, u8 speed) 
	struct ide_timing t, p;

	int T, UT;



	if (speed != XFER_PIO_SLOW && speed != drive->current_speed)

		if (ide_config_drive_speed(drive, speed))

			printk(KERN_WARNING "ide%d: Drive %d didn't accept speed setting. Oh, well.\n",

				drive->dn >> 1, drive->dn & 1);

	if (speed != XFER_PIO_SLOW)

		ide_config_drive_speed(drive, speed);



	T = 1000000000 / amd_clock;

	UT = T / min_t(int, max_t(int, amd_config->flags & AMD_UDMA, 1), 2);

drivers/ide/pci/hpt366.c

+16 −5
Original line number Diff line number Diff line 
/*

 * linux/drivers/ide/pci/hpt366.c		Version 1.04	Jun 4, 2007

 * linux/drivers/ide/pci/hpt366.c		Version 1.06	Jun 27, 2007

 *

 * Copyright (C) 1999-2003		Andre Hedrick <andre@linux-ide.org>

 * Portions Copyright (C) 2001	        Sun Microsystems, Inc.
@@ -182,6 +182,7 @@ static const char *bad_ata66_4[] = { 
	"IC35L040AVER07-0",

	"IC35L060AVER07-0",

	"WDC AC310200R",

	"MAXTOR STM3320620A",

	NULL

};
@@ -1513,18 +1514,28 @@ static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d) 
		goto init_single;



	/*

	 * HPT36x chips are single channel and

	 * do not seem to have the channel enable bit...

	 * HPT36x chips have one channel per function and have

	 * both channel enable bits located differently and visible

	 * to both functions -- really stupid design decision... :-(

	 * Bit 4 is for the primary channel, bit 5 for the secondary.

	 */

	d->channels = 1;

	d->enablebits[0].reg = 0;

	d->enablebits[0].mask = d->enablebits[0].val = 0x10;



	if ((dev2 = pci_get_slot(dev->bus, dev->devfn + 1)) != NULL) {

	  	u8  pin1 = 0, pin2 = 0;

		u8  mcr1 = 0, pin1 = 0, pin2 = 0;

		int ret;



		pci_set_drvdata(dev2, info[rev]);



		/*

		 * Now we'll have to force both channels enabled if

		 * at least one of them has been enabled by BIOS...

		 */

		pci_read_config_byte(dev, 0x50, &mcr1);

		if (mcr1 & 0x30)

			pci_write_config_byte(dev, 0x50, mcr1 | 0x30);



		pci_read_config_byte(dev,  PCI_INTERRUPT_PIN, &pin1);

		pci_read_config_byte(dev2, PCI_INTERRUPT_PIN, &pin2);

		if (pin1 != pin2 && dev->irq == dev2->irq) {

drivers/ide/pci/it821x.c

+1 −2
Original line number Diff line number Diff line 


/*

 * linux/drivers/ide/pci/it821x.c		Version 0.15	Jun 2 2007

 * linux/drivers/ide/pci/it821x.c		Version 0.16	Jul 3 2007

 *

 * Copyright (C) 2004		Red Hat <alan@redhat.com>

 * Copyright (C) 2007		Bartlomiej Zolnierkiewicz
@@ -660,7 +660,6 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif) 


	hwif->ultra_mask = 0x7f;

	hwif->mwdma_mask = 0x07;

	hwif->swdma_mask = 0x07;



	hwif->ide_dma_check = &it821x_config_drive_for_dma;

	if (!(hwif->udma_four))