[PATCH] pata_parport: fix parport release without claim

[PATCH] pata_parport: fix parport release without claim

[Ondrej Zary]

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: Ondrej Zary <linux@zary.sk>
---
 drivers/ata/pata_parport/pata_parport.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/pata_parport/pata_parport.c b/drivers/ata/pata_parport/pata_parport.c
index fb1f10afa722..b31cd2a845db 100644
--- a/drivers/ata/pata_parport/pata_parport.c
+++ b/drivers/ata/pata_parport/pata_parport.c
@@ -558,12 +558,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);
-- 
Ondrej Zary

Re: [PATCH] pata_parport: fix parport release without claim

[Sergey Shtylyov]

On 3/11/23 10:25 PM, Ondrej Zary wrote:

> 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: Ondrej Zary <linux@zary.sk>

[...]

Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>

MBR, Sergey

Re: [PATCH] pata_parport: fix parport release without claim

[Damien Le Moal]

On 3/12/23 04:25, Ondrej Zary wrote:
> 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: Ondrej Zary <linux@zary.sk>

Applied to for-6.3-fixes. Thanks !


-- 
Damien Le Moal
Western Digital Research