Commit 301ce089 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] scsi/ppa.c cleanup and fixes (3/9)

	* killed ppa_pb_claim() call in ppa_init()
parent 274bd75f
...@@ -201,12 +201,13 @@ static int ppa_detect(Scsi_Host_Template *host) ...@@ -201,12 +201,13 @@ static int ppa_detect(Scsi_Host_Template *host)
w_ecr(ppb_hi, 0x80); w_ecr(ppb_hi, 0x80);
/* Done configuration */ /* Done configuration */
ppa_pb_release(dev);
if (ppa_init(dev)) { if (ppa_init(dev)) {
ppa_pb_release(dev);
parport_unregister_device(dev->dev); parport_unregister_device(dev->dev);
continue; continue;
} }
ppa_pb_release(dev);
/* now the glue ... */ /* now the glue ... */
switch (dev->mode) { switch (dev->mode) {
case PPA_NIBBLE: case PPA_NIBBLE:
...@@ -629,12 +630,6 @@ static int ppa_init(ppa_struct *dev) ...@@ -629,12 +630,6 @@ static int ppa_init(ppa_struct *dev)
int retv; int retv;
unsigned short ppb = dev->base; unsigned short ppb = dev->base;
#if defined(CONFIG_PARPORT) || defined(CONFIG_PARPORT_MODULE)
if (ppa_pb_claim(dev))
while (dev->p_busy)
schedule(); /* We can safe schedule here */
#endif
ppa_disconnect(dev); ppa_disconnect(dev);
ppa_connect(dev, CONNECT_NORMAL); ppa_connect(dev, CONNECT_NORMAL);
...@@ -657,7 +652,6 @@ static int ppa_init(ppa_struct *dev) ...@@ -657,7 +652,6 @@ static int ppa_init(ppa_struct *dev)
if (!retv) if (!retv)
retv = device_check(dev); retv = device_check(dev);
ppa_pb_release(dev);
return retv; return retv;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment