summaryrefslogtreecommitdiff
path: root/net/9p/trans_virtio.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-18 01:08:58 +0300
committerTony Lindgren <tony@atomide.com>2010-02-18 01:08:58 +0300
commit80c20d543d142ee54ec85259b77aaf0b83c32db5 (patch)
tree364017b2c001939bbb645dcc20d565c1f71b13a8 /net/9p/trans_virtio.c
parentd6a2d9b800276140abf352908abbd0c240890692 (diff)
parentb72c7d543589736d43da531566490dd31572f5ca (diff)
downloadlinux-80c20d543d142ee54ec85259b77aaf0b83c32db5.tar.xz
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'net/9p/trans_virtio.c')
-rw-r--r--net/9p/trans_virtio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index ea1e3daabefe..cb50f4ae5eef 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -102,7 +102,8 @@ static void p9_virtio_close(struct p9_client *client)
struct virtio_chan *chan = client->trans;
mutex_lock(&virtio_9p_lock);
- chan->inuse = false;
+ if (chan)
+ chan->inuse = false;
mutex_unlock(&virtio_9p_lock);
}
@@ -311,6 +312,7 @@ p9_virtio_create(struct p9_client *client, const char *devname, char *args)
}
client->trans = (void *)chan;
+ client->status = Connected;
chan->client = client;
return 0;