Commit dc472c76 authored by Ondrej Zary's avatar Ondrej Zary Committed by Damien Le Moal
Browse files

ata: pata_parport: fix parport release without claim 



When adapter is not found, pi->disconnect() is called without previous
pi->connect(). This results in error like this:
parport0: pata_parport tried to release parport when not owner

Add missing out_disconnect label and use it correctly.

Signed-off-by: default avatarOndrej Zary <linux@zary.sk>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent eeac8ede

drivers/ata/pata_parport/pata_parport.c

+3 −2
Original line number Diff line number Diff line
@@ -487,12 +487,13 @@ static struct pi_adapter *pi_init_one(struct parport *parport, 


	pi_connect(pi);

	if (ata_host_activate(host, 0, NULL, 0, &pata_parport_sht))

		goto out_unreg_parport;

		goto out_disconnect;



	return pi;



out_unreg_parport:

out_disconnect:

	pi_disconnect(pi);

out_unreg_parport:

	parport_unregister_device(pi->pardev);

	if (pi->proto->release_proto)

		pi->proto->release_proto(pi);