Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8188fc8b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6da6c0db 00ad691a

arch/sparc/include/uapi/asm/oradax.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * This program is free software: you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation, either version 3 of the License, or

 * the Free Software Foundation, either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

arch/sparc/kernel/vio.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp, 
	if (err) {

		printk(KERN_ERR "VIO: Could not register device %s, err=%d\n",

		       dev_name(&vdev->dev), err);

		kfree(vdev);

		put_device(&vdev->dev);

		return NULL;

	}

	if (vdev->dp)

drivers/sbus/char/oradax.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * This program is free software: you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation, either version 3 of the License, or

 * the Free Software Foundation, either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,