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

Commit 788d6697 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

qd65xx: fix setup of QD6580 Control register 



Control register of QD6580 should be setup before probing for devices.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent c53ea18d

drivers/ide/legacy/qd65xx.c

+2 −4
Original line number Diff line number Diff line
@@ -444,6 +444,8 @@ static int __init qd_probe(int base) 
		printk(KERN_DEBUG "qd6580: config=%#x, control=%#x, ID3=%u\n",

			config, control, QD_ID3);



		outb(QD_DEF_CONTR, QD_CONTROL_PORT);



		if (control & QD_CONTR_SEC_DISABLED) {

			/* secondary disabled */
@@ -460,8 +462,6 @@ static int __init qd_probe(int base) 


			ide_device_add(idx, &qd65xx_port_info);



			outb(QD_DEF_CONTR, QD_CONTROL_PORT);



			return 1;

		} else {

			ide_hwif_t *mate;
@@ -487,8 +487,6 @@ static int __init qd_probe(int base) 


			ide_device_add(idx, &qd65xx_port_info);



			outb(QD_DEF_CONTR, QD_CONTROL_PORT);



			return 0; /* no other qd65xx possible */

		}

	}