Commit c6b82347 authored by Christoph Hellwig's avatar Christoph Hellwig

[PATCH] get rid of ->init in osst

Since osst is the last driver still implementing ->init and Willem said
he's gonna do a major update including a resync with st anyway I think
it's okay to put this hack in for now.  Instead of ->init beeing
directly called from the midlayer osst_attach now calls in in the
beginning - it has an internal protection so that the initialization
will be called only one anyway.
parent 6f44d7ff
...@@ -164,7 +164,6 @@ struct Scsi_Device_Template osst_template = ...@@ -164,7 +164,6 @@ struct Scsi_Device_Template osst_template =
scsi_type: TYPE_TAPE, scsi_type: TYPE_TAPE,
major: OSST_MAJOR, major: OSST_MAJOR,
detect: osst_detect, detect: osst_detect,
init: osst_init,
attach: osst_attach, attach: osst_attach,
detach: osst_detach detach: osst_detach
}; };
...@@ -5428,6 +5427,8 @@ static int osst_attach(Scsi_Device * SDp) ...@@ -5428,6 +5427,8 @@ static int osst_attach(Scsi_Device * SDp)
if (SDp->type != TYPE_TAPE || !osst_supports(SDp)) if (SDp->type != TYPE_TAPE || !osst_supports(SDp))
return 1; return 1;
osst_init();
if (osst_template.nr_dev >= osst_template.dev_max) { if (osst_template.nr_dev >= osst_template.dev_max) {
SDp->attached--; SDp->attached--;
return 1; return 1;
......
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