Commit 360db2b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux 

Pull pcmcia update from Dominik Brodowski:
 "Improve the use of the kobj API in the core of the Linux PCMCIA
  subsystem"

* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: Switch to using the new API kobj_to_dev()
parents 8b83369d 4ce6b242

drivers/pcmcia/cistpl.c

+2 −2
Original line number Diff line number Diff line
@@ -1554,7 +1554,7 @@ static ssize_t pccard_show_cis(struct file *filp, struct kobject *kobj, 
		if (off + count > size)

			count = size - off;



		s = to_socket(container_of(kobj, struct device, kobj));

		s = to_socket(kobj_to_dev(kobj));



		if (!(s->state & SOCKET_PRESENT))

			return -ENODEV;
@@ -1581,7 +1581,7 @@ static ssize_t pccard_store_cis(struct file *filp, struct kobject *kobj, 
	if (error)

		return error;



	s = to_socket(container_of(kobj, struct device, kobj));

	s = to_socket(kobj_to_dev(kobj));



	if (off)

		return -EINVAL;