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

Commit 878701db 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:
  scc_pata: PIO fixes
  piix/slc90e66: fix PIO1 handling in ->speedproc method (take 2)
  jmicron: PIO fixes
  it8213: PIO fixes (take 2)
  cs5535: PIO fixes
  cs5520: fix PIO auto-tuning in ->ide_dma_check method
  drivers/scsi/ide-scsi.c: kmalloc + memset conversion to kzalloc
  drivers/ide/arm/icside.c: kmalloc + memset conversion to kzalloc
  ide: eliminate warnings in ide-tape.c
  ide: fix runtogether printk's in cmd64x IDE driver
  sis5513: Add FSC Amilo A1630 PCI subvendor/dev to laptops
  alim15x3: Correct HP detect
  ide: Fix an overrun found in the CS5535 IDE driver
parents 04668873 3fcece66

drivers/ide/arm/icside.c

+1 −2
Original line number Diff line number Diff line
@@ -693,13 +693,12 @@ icside_probe(struct expansion_card *ec, const struct ecard_id *id) 
	if (ret)

		goto out;



	state = kmalloc(sizeof(struct icside_state), GFP_KERNEL);

	state = kzalloc(sizeof(struct icside_state), GFP_KERNEL);

	if (!state) {

		ret = -ENOMEM;

		goto release;

	}



	memset(state, 0, sizeof(state));

	state->type	= ICS_TYPE_NOTYPE;

	state->dev	= &ec->dev;

drivers/ide/ide-tape.c

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ typedef enum { 
} idetape_chrdev_direction_t;



struct idetape_bh {

	unsigned short b_size;

	u32 b_size;

	atomic_t b_count;

	struct idetape_bh *b_reqnext;

	char *b_data;

drivers/ide/pci/alim15x3.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ static struct dmi_system_id cable_dmi_table[] = { 
		.ident = "HP Pavilion N5430",

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),

			DMI_MATCH(DMI_BOARD_NAME, "OmniBook N32N-736"),

			DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"),

		},

	},

	{ }

drivers/ide/pci/cmd64x.c

+2 −2
Original line number Diff line number Diff line
@@ -475,11 +475,11 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const cha 
		switch (rev) {

		case 0x07:

		case 0x05:

			printk("%s: UltraDMA capable", name);

			printk("%s: UltraDMA capable\n", name);

			break;

		case 0x03:

		default:

			printk("%s: MultiWord DMA force limited", name);

			printk("%s: MultiWord DMA force limited\n", name);

			break;

		case 0x01:

			printk("%s: MultiWord DMA limited, "

drivers/ide/pci/cs5520.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static void cs5520_tune_drive(ide_drive_t *drive, u8 pio) 
static int cs5520_config_drive_xfer_rate(ide_drive_t *drive)

{

	/* Tune the drive for PIO modes up to PIO 4 */	

	cs5520_tune_drive(drive, 4);

	cs5520_tune_drive(drive, 255);



	/* Then tell the core to use DMA operations */

	return 0;