Skip to content

Commit

Permalink
pcmcia: ensure correct logging in do_io_probe
Browse files Browse the repository at this point in the history
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  • Loading branch information
Dominik Brodowski committed Nov 9, 2008
1 parent 980fc29 commit b176945
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/pcmcia/cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,6 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)

spin_lock_init(&socket->lock);

if (socket->resource_ops->init) {
ret = socket->resource_ops->init(socket);
if (ret)
return (ret);
}

/* try to obtain a socket number [yes, it gets ugly if we
* register more than 2^sizeof(unsigned int) pcmcia
* sockets... but the socket number is deprecated
Expand Down Expand Up @@ -239,6 +233,12 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)
mutex_init(&socket->skt_mutex);
spin_lock_init(&socket->thread_lock);

if (socket->resource_ops->init) {
ret = socket->resource_ops->init(socket);
if (ret)
goto err;
}

tsk = kthread_run(pccardd, socket, "pccardd");
if (IS_ERR(tsk)) {
ret = PTR_ERR(tsk);
Expand Down

0 comments on commit b176945

Please sign in to comment.