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

Commit b41a080f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  piix: The Sony TZ90 needs the cable type hardcoding
  icside: register second channel of version 6 PCB
  ide-tape: remove back-to-back REQUEST_SENSE detection
parents 5fe4990a d8788298

drivers/ide/icside.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) 
	struct ide_host *host;

	unsigned int sel = 0;

	int ret;

	hw_regs_t hw[2], *hws[] = { &hw[0], NULL, NULL, NULL };

	hw_regs_t hw[2], *hws[] = { &hw[0], &hw[1], NULL, NULL };

	struct ide_port_info d = icside_v6_port_info;



	ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);

drivers/ide/ide-tape.c

+0 −6
Original line number Diff line number Diff line
@@ -614,12 +614,6 @@ static ide_startstop_t ide_tape_issue_pc(ide_drive_t *drive, 
{

	idetape_tape_t *tape = drive->driver_data;



	if (drive->pc->c[0] == REQUEST_SENSE &&

	    pc->c[0] == REQUEST_SENSE) {

		printk(KERN_ERR "ide-tape: possible ide-tape.c bug - "

			"Two request sense in serial were issued\n");

	}



	if (drive->failed_pc == NULL && pc->c[0] != REQUEST_SENSE)

		drive->failed_pc = pc;

drivers/ide/piix.c

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ static const struct ich_laptop ich_laptop[] = { 
	{ 0x24CA, 0x1025, 0x003d },	/* ICH4 on ACER TM290 */

	{ 0x266F, 0x1025, 0x0066 },	/* ICH6 on ACER Aspire 1694WLMi */

	{ 0x2653, 0x1043, 0x82D8 },	/* ICH6M on Asus Eee 701 */

	{ 0x27df, 0x104d, 0x900e },	/* ICH7 on Sony TZ-90 */

	/* end marker */

	{ 0, }

};