diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-05 08:26:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-05 08:26:54 -0700 |
| commit | 3cedbec301015d8fb914e7e3af0fc0e034b87d34 (patch) | |
| tree | e0afaf544a3de752589567da9030be4fb1fb8b30 | |
| parent | 21a9703de3045cda0b3aaa5bc193d2e1062908d2 (diff) | |
| parent | e00f7bd221292b318d4d09c3f0c2c8af9b1e5edf (diff) | |
| download | linux-3cedbec301015d8fb914e7e3af0fc0e034b87d34.tar.bz2 | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio/qemu fixes from Michael Tsirkin:
"A couple of fixes for virtio and for the new QEMU fw cfg driver"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio: Silence uninitialized variable warning
firmware: qemu_fw_cfg.c: potential unintialized variable
| -rw-r--r-- | drivers/firmware/qemu_fw_cfg.c | 2 | ||||
| -rw-r--r-- | drivers/virtio/virtio_ring.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index 815c4a5cae54..1b95475b6aef 100644 --- a/drivers/firmware/qemu_fw_cfg.c +++ b/drivers/firmware/qemu_fw_cfg.c @@ -77,7 +77,7 @@ static inline u16 fw_cfg_sel_endianness(u16 key) static inline void fw_cfg_read_blob(u16 key, void *buf, loff_t pos, size_t count) { - u32 glk; + u32 glk = -1U; acpi_status status; /* If we have ACPI, ensure mutual exclusion against any potential diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 5c802d47892c..ca6bfddaacad 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -1006,7 +1006,7 @@ struct virtqueue *vring_create_virtqueue( const char *name) { struct virtqueue *vq; - void *queue; + void *queue = NULL; dma_addr_t dma_addr; size_t queue_size_in_bytes; struct vring vring; |