git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b43: N-PHY: some dummy PHY rev 3 calls
[safe/jmp/linux-2.6]
/
net
/
9p
/
trans_virtio.c
diff --git
a/net/9p/trans_virtio.c
b/net/9p/trans_virtio.c
index
b2e07f0
..
cb50f4a
100644
(file)
--- a/
net/9p/trans_virtio.c
+++ b/
net/9p/trans_virtio.c
@@
-43,7
+43,6
@@
#include <net/9p/transport.h>
#include <linux/scatterlist.h>
#include <linux/virtio.h>
#include <net/9p/transport.h>
#include <linux/scatterlist.h>
#include <linux/virtio.h>
-#include <linux/virtio_ids.h>
#include <linux/virtio_9p.h>
#define VIRTQUEUE_NUM 128
#include <linux/virtio_9p.h>
#define VIRTQUEUE_NUM 128
@@
-103,7
+102,8
@@
static void p9_virtio_close(struct p9_client *client)
struct virtio_chan *chan = client->trans;
mutex_lock(&virtio_9p_lock);
struct virtio_chan *chan = client->trans;
mutex_lock(&virtio_9p_lock);
- chan->inuse = false;
+ if (chan)
+ chan->inuse = false;
mutex_unlock(&virtio_9p_lock);
}
mutex_unlock(&virtio_9p_lock);
}
@@
-312,6
+312,7
@@
p9_virtio_create(struct p9_client *client, const char *devname, char *args)
}
client->trans = (void *)chan;
}
client->trans = (void *)chan;
+ client->status = Connected;
chan->client = client;
return 0;
chan->client = client;
return 0;