diff options
author | Linus Torvalds | 2010-11-24 22:57:11 +0100 |
---|---|---|
committer | Linus Torvalds | 2010-11-24 22:57:11 +0100 |
commit | c42978f7ecaa5c29bdd5fea507e09e6eff9d9f27 (patch) | |
tree | f5aa36fa1714e907c14eb84c779dd07d2818045e /drivers/virtio/virtio.c | |
parent | arch/x86/include/asm/fixmap.h: mark __set_fixmap_offset as __always_inline (diff) | |
parent | virtio: fix format of sysfs driver/vendor files (diff) | |
download | kernel-qcow2-linux-c42978f7ecaa5c29bdd5fea507e09e6eff9d9f27.tar.gz kernel-qcow2-linux-c42978f7ecaa5c29bdd5fea507e09e6eff9d9f27.tar.xz kernel-qcow2-linux-c42978f7ecaa5c29bdd5fea507e09e6eff9d9f27.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
virtio: fix format of sysfs driver/vendor files
Char: virtio_console, fix memory leak
virtio: return correct capacity to users
module: Update prototype for ref_module (formerly use_module)
Diffstat (limited to 'drivers/virtio/virtio.c')
-rw-r--r-- | drivers/virtio/virtio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index 3a43ebf83a49..efb35aa8309a 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c @@ -9,19 +9,19 @@ static ssize_t device_show(struct device *_d, struct device_attribute *attr, char *buf) { struct virtio_device *dev = container_of(_d,struct virtio_device,dev); - return sprintf(buf, "%hu", dev->id.device); + return sprintf(buf, "0x%04x\n", dev->id.device); } static ssize_t vendor_show(struct device *_d, struct device_attribute *attr, char *buf) { struct virtio_device *dev = container_of(_d,struct virtio_device,dev); - return sprintf(buf, "%hu", dev->id.vendor); + return sprintf(buf, "0x%04x\n", dev->id.vendor); } static ssize_t status_show(struct device *_d, struct device_attribute *attr, char *buf) { struct virtio_device *dev = container_of(_d,struct virtio_device,dev); - return sprintf(buf, "0x%08x", dev->config->get_status(dev)); + return sprintf(buf, "0x%08x\n", dev->config->get_status(dev)); } static ssize_t modalias_show(struct device *_d, struct device_attribute *attr, char *buf) |