Commit 1a81a8f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide 

Pull IDE updates from David Miller:
 "Just a couple small bug fixes, nothing overly exciting in here"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: missing break statement in set_timings_mdma()
  ide: hpt366: fix incorrect mask when checking at cmd_high_time
  ide-tape: fix misprint in failure handling in idetape_init()
  cmd640: add __init attribute
parents 86505fc0 d4f8c2e0

drivers/ide/cmd640.c

+1 −1
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ static const struct ide_port_info cmd640_port_info __initconst = { 
	.pio_mask		= ATA_PIO5,

};



static int cmd640x_init_one(unsigned long base, unsigned long ctl)

static int __init cmd640x_init_one(unsigned long base, unsigned long ctl)

{

	if (!request_region(base, 8, DRV_NAME)) {

		printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n",

drivers/ide/hpt366.c

+1 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ static int init_chipset_hpt366(struct pci_dev *dev) 
		pci_read_config_dword(dev, 0x40, &itr1);



		/* Detect PCI clock by looking at cmd_high_time. */

		switch((itr1 >> 8) & 0x07) {

		switch ((itr1 >> 8) & 0x0f) {

			case 0x09:

				pci_clk = 40;

				break;

drivers/ide/ide-tape.c

+3 −3
Original line number Diff line number Diff line
@@ -2052,12 +2052,12 @@ static int __init idetape_init(void) 


	error = driver_register(&idetape_driver.gen_driver);

	if (error)

		goto out_free_driver;

		goto out_free_chrdev;



	return 0;



out_free_driver:

	driver_unregister(&idetape_driver.gen_driver);

out_free_chrdev:

	unregister_chrdev(IDETAPE_MAJOR, "ht");

out_free_class:

	class_destroy(idetape_sysfs_class);

out:

drivers/ide/pmac.c

+1 −0
Original line number Diff line number Diff line
@@ -707,6 +707,7 @@ set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2, 
		*timings = ((*timings) & ~TR_133_PIOREG_MDMA_MASK) | tr;

		*timings2 = (*timings2) & ~TR_133_UDMAREG_UDMA_EN;

		}

		break;

	case controller_un_ata6:

	case controller_k2_ata6: {

		/* 100Mhz cell */

CRA Git | Maintained and supported by SUSTech CRA and CCSE