Commit c2dfd227 authored by Jaedon Shin's avatar Jaedon Shin Committed by Mauro Carvalho Chehab
Browse files

media: dvb_frontend: Add compat_ioctl callback 



Adds compat_ioctl for 32-bit user space applications on a 64-bit system.

[m.chehab@osg.samsung.com: add missing include compat.h]
Signed-off-by: default avatarJaedon Shin <jaedon.shin@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent a2282fd1

drivers/media/dvb-core/dvb_frontend.c

+12 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <linux/jiffies.h>

#include <linux/kthread.h>

#include <linux/ktime.h>

#include <linux/compat.h>

#include <asm/processor.h>



#include "dvb_frontend.h"
@@ -1977,6 +1978,14 @@ static long dvb_frontend_ioctl(struct file *file, unsigned int cmd, 
	return dvb_usercopy(file, cmd, arg, dvb_frontend_do_ioctl);

}



#ifdef CONFIG_COMPAT

static long dvb_frontend_compat_ioctl(struct file *file, unsigned int cmd,

				      unsigned long arg)

{

	return dvb_frontend_ioctl(file, cmd, (unsigned long)compat_ptr(arg));

}

#endif



static int dtv_set_frontend(struct dvb_frontend *fe)

{

	struct dvb_frontend_private *fepriv = fe->frontend_priv;
@@ -2661,6 +2670,9 @@ static int dvb_frontend_release(struct inode *inode, struct file *file) 
static const struct file_operations dvb_frontend_fops = {

	.owner		= THIS_MODULE,

	.unlocked_ioctl	= dvb_frontend_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= dvb_frontend_compat_ioctl,

#endif

	.poll		= dvb_frontend_poll,

	.open		= dvb_frontend_open,

	.release	= dvb_frontend_release,

fs/compat_ioctl.c

+0 −17
Original line number Diff line number Diff line
@@ -1218,23 +1218,6 @@ COMPATIBLE_IOCTL(DMX_SET_PES_FILTER) 
COMPATIBLE_IOCTL(DMX_SET_BUFFER_SIZE)

COMPATIBLE_IOCTL(DMX_GET_PES_PIDS)

COMPATIBLE_IOCTL(DMX_GET_STC)

COMPATIBLE_IOCTL(FE_GET_INFO)

COMPATIBLE_IOCTL(FE_DISEQC_RESET_OVERLOAD)

COMPATIBLE_IOCTL(FE_DISEQC_SEND_MASTER_CMD)

COMPATIBLE_IOCTL(FE_DISEQC_RECV_SLAVE_REPLY)

COMPATIBLE_IOCTL(FE_DISEQC_SEND_BURST)

COMPATIBLE_IOCTL(FE_SET_TONE)

COMPATIBLE_IOCTL(FE_SET_VOLTAGE)

COMPATIBLE_IOCTL(FE_ENABLE_HIGH_LNB_VOLTAGE)

COMPATIBLE_IOCTL(FE_READ_STATUS)

COMPATIBLE_IOCTL(FE_READ_BER)

COMPATIBLE_IOCTL(FE_READ_SIGNAL_STRENGTH)

COMPATIBLE_IOCTL(FE_READ_SNR)

COMPATIBLE_IOCTL(FE_READ_UNCORRECTED_BLOCKS)

COMPATIBLE_IOCTL(FE_SET_FRONTEND)

COMPATIBLE_IOCTL(FE_GET_FRONTEND)

COMPATIBLE_IOCTL(FE_GET_EVENT)

COMPATIBLE_IOCTL(FE_DISHNETWORK_SEND_LEGACY_CMD)

COMPATIBLE_IOCTL(VIDEO_STOP)

COMPATIBLE_IOCTL(VIDEO_PLAY)

COMPATIBLE_IOCTL(VIDEO_FREEZE)