Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'rproc-3.7-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
Pull remoteproc fix from Ohad Ben-Cohen:
"A single remoteproc fix for an error path issue reported by Ido Yariv."
* tag 'rproc-3.7-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
remoteproc: fix error path of ->find_vqs
+12
-6
+12
-6
drivers/remoteproc/remoteproc_virtio.c
+12
-6
drivers/remoteproc/remoteproc_virtio.c
···
120
120
return vq;
121
121
}
122
122
123
-
static void rproc_virtio_del_vqs(struct virtio_device *vdev)
123
+
static void __rproc_virtio_del_vqs(struct virtio_device *vdev)
124
124
{
125
125
struct virtqueue *vq, *n;
126
-
struct rproc *rproc = vdev_to_rproc(vdev);
127
126
struct rproc_vring *rvring;
128
-
129
-
/* power down the remote processor before deleting vqs */
130
-
rproc_shutdown(rproc);
131
127
132
128
list_for_each_entry_safe(vq, n, &vdev->vqs, list) {
133
129
rvring = vq->priv;
···
131
135
vring_del_virtqueue(vq);
132
136
rproc_free_vring(rvring);
133
137
}
138
+
}
139
+
140
+
static void rproc_virtio_del_vqs(struct virtio_device *vdev)
141
+
{
142
+
struct rproc *rproc = vdev_to_rproc(vdev);
143
+
144
+
/* power down the remote processor before deleting vqs */
145
+
rproc_shutdown(rproc);
146
+
147
+
__rproc_virtio_del_vqs(vdev);
134
148
}
135
149
136
150
static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned nvqs,
···
169
163
return 0;
170
164
171
165
error:
172
-
rproc_virtio_del_vqs(vdev);
166
+
__rproc_virtio_del_vqs(vdev);
173
167
return ret;
174
168
}
175
169