tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

- Fixup license text for oradax driver, from Rob Gardner.

- Release device object with put_device() instead of straight kfree(),
from Arvind Yadav.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: vio: use put_device() instead of kfree()
sparc64: Fix mistake in oradax license text

Linus Torvalds 8188fc8b 6da6c0db

+3 -3
+1 -1
arch/sparc/include/uapi/asm/oradax.h
··· 3 3 * 4 4 * This program is free software: you can redistribute it and/or modify 5 5 * it under the terms of the GNU General Public License as published by 6 - * the Free Software Foundation, either version 3 of the License, or 6 + * the Free Software Foundation, either version 2 of the License, or 7 7 * (at your option) any later version. 8 8 * 9 9 * This program is distributed in the hope that it will be useful,
+1 -1
arch/sparc/kernel/vio.c
··· 403 403 if (err) { 404 404 printk(KERN_ERR "VIO: Could not register device %s, err=%d\n", 405 405 dev_name(&vdev->dev), err); 406 - kfree(vdev); 406 + put_device(&vdev->dev); 407 407 return NULL; 408 408 } 409 409 if (vdev->dp)
+1 -1
drivers/sbus/char/oradax.c
··· 3 3 * 4 4 * This program is free software: you can redistribute it and/or modify 5 5 * it under the terms of the GNU General Public License as published by 6 - * the Free Software Foundation, either version 3 of the License, or 6 + * the Free Software Foundation, either version 2 of the License, or 7 7 * (at your option) any later version. 8 8 * 9 9 * This program is distributed in the hope that it will be useful,