Commit 3cedbec3 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 21a9703d e00f7bd2
...@@ -77,7 +77,7 @@ static inline u16 fw_cfg_sel_endianness(u16 key) ...@@ -77,7 +77,7 @@ static inline u16 fw_cfg_sel_endianness(u16 key)
static inline void fw_cfg_read_blob(u16 key, static inline void fw_cfg_read_blob(u16 key,
void *buf, loff_t pos, size_t count) void *buf, loff_t pos, size_t count)
{ {
u32 glk; u32 glk = -1U;
acpi_status status; acpi_status status;
/* If we have ACPI, ensure mutual exclusion against any potential /* If we have ACPI, ensure mutual exclusion against any potential
......
...@@ -1006,7 +1006,7 @@ struct virtqueue *vring_create_virtqueue( ...@@ -1006,7 +1006,7 @@ struct virtqueue *vring_create_virtqueue(
const char *name) const char *name)
{ {
struct virtqueue *vq; struct virtqueue *vq;
void *queue; void *queue = NULL;
dma_addr_t dma_addr; dma_addr_t dma_addr;
size_t queue_size_in_bytes; size_t queue_size_in_bytes;
struct vring vring; struct vring vring;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment