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

Commit 15d0a873 authored by Marc Zyngier's avatar Marc Zyngier Committed by Dominik Brodowski
Browse files

pcmcia: fix compilation after 16bit state locking changes 



Commit 04de0816 (pcmcia: pcmcia_dev_present bugfix) broke the
deprecated ioctl layer. Fix it by getting rid of references to
unexisting fields.

Signed-off-by: default avatarMarc Zyngier <maz@misterjones.org>
Reported-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 43821242

drivers/pcmcia/pcmcia_ioctl.c

+1 −6
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ static int ds_open(struct inode *inode, struct file *file) 
	    warning_printed = 1;

    }



    if (s->pcmcia_state.present)

    if (atomic_read(&s->present))

	queue_event(user, CS_EVENT_CARD_INSERTION);

out:

    unlock_kernel();
@@ -770,9 +770,6 @@ static ssize_t ds_read(struct file *file, char __user *buf, 
	return -EIO;



    s = user->socket;

    if (s->pcmcia_state.dead)

	return -EIO;



    ret = wait_event_interruptible(s->queue, !queue_empty(user));

    if (ret == 0)

	ret = put_user(get_queued_event(user), (int __user *)buf) ? -EFAULT : 4;
@@ -838,8 +835,6 @@ static int ds_ioctl(struct inode *inode, struct file *file, 
	return -EIO;



    s = user->socket;

    if (s->pcmcia_state.dead)

	return -EIO;



    size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;

    if (size > sizeof(ds_ioctl_arg_t))