View | Details | Raw Unified
Collapse All | Expand All

(-) ivtv-0.10.1-orig/driver/ivtv-ioctl.c (-4 / +4 lines)
 Lines 556-563    Link Here  
	/* ioctls to allow direct access to the encoder registers for testing */
	/* ioctls to allow direct access to the encoder registers for testing */
	case VIDIOC_INT_G_REGISTER:
	case VIDIOC_INT_G_REGISTER:
		IVTV_DEBUG_IOCTL("VIDIOC_INT_G_REGISTER\n");
		IVTV_DEBUG_IOCTL("VIDIOC_INT_G_REGISTER\n");
		if (reg->i2c_id)
 
		if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER)
 
			return ivtv_i2c_id(itv, reg->i2c_id, cmd, reg);
 
			return ivtv_i2c_id(itv, reg->match_chip, cmd, reg);
 
		return ivtv_itvc(itv, cmd, arg);
		return ivtv_itvc(itv, cmd, arg);

        
	case VIDIOC_INT_S_REGISTER:
	case VIDIOC_INT_S_REGISTER:

  

    

    

       Lines 566-573
       
    
  Link Here 
    

  

        
		cmd = VIDIOC_INT_S_REGISTER;
		cmd = VIDIOC_INT_S_REGISTER;

        
#endif
#endif

        
		IVTV_DEBUG_IOCTL("VIDIOC_INT_S_REGISTER\n");
		IVTV_DEBUG_IOCTL("VIDIOC_INT_S_REGISTER\n");

            

              
		if (reg->i2c_id)

              
		if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER)

            

            

              
			return ivtv_i2c_id(itv, reg->i2c_id, cmd, reg);

              
			return ivtv_i2c_id(itv, reg->match_chip, cmd, reg);

            

        
		return ivtv_itvc(itv, cmd, arg);
		return ivtv_itvc(itv, cmd, arg);

        

        
	case VIDIOC_INT_S_AUDIO_ROUTING: {
	case VIDIOC_INT_S_AUDIO_ROUTING: {



(-) ivtv-0.10.1-orig/i2c-drivers/saa717x.c
      (-2 / +7 lines)




  

    

    

       Lines 62-67
       
    
  Link Here 
    

  

        
#include <linux/i2c.h>
#include <linux/i2c.h>

        
#include <media/v4l2-common.h>
#include <media/v4l2-common.h>

        

            

              
              
#ifdef VIDIOC_DBG_S_REGISTER

            

            

              
              
#define VIDIOC_INT_S_REGISTER VIDIOC_DBG_S_REGISTER

            

            

              
              
#define VIDIOC_INT_G_REGISTER VIDIOC_DBG_G_REGISTER

            

            

              
              
#endif

            

            

              
              

            

        
MODULE_DESCRIPTION("Philips SAA717x video decoder driver");
MODULE_DESCRIPTION("Philips SAA717x video decoder driver");

        
MODULE_AUTHOR("Kevin Thayer, K. Ohta");
MODULE_AUTHOR("Kevin Thayer, K. Ohta");

        
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");

  

    

    

       Lines 1257-1263
       
    
  Link Here 
    

  

        
	{
	{

        
		struct v4l2_register *reg = arg;
		struct v4l2_register *reg = arg;

        

            

              
		if (reg->i2c_id != I2C_DRIVERID_SAA717X)

              
if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER && reg->match_chip != I2C_DRIVERID_SAA717X)

            

        
			return -EINVAL;
			return -EINVAL;

        
		reg->val = saa717x_read(client, reg->reg);
		reg->val = saa717x_read(client, reg->reg);

        
		break;
		break;

  

    

    

       Lines 1269-1275
       
    
  Link Here 
    

  

        
		u16 addr = reg->reg & 0xffff;
		u16 addr = reg->reg & 0xffff;

        
		u8 val = reg->val & 0xff;
		u8 val = reg->val & 0xff;

        

            

              
		if (reg->i2c_id != I2C_DRIVERID_SAA717X)

              
		if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER && reg->match_chip != I2C_DRIVERID_SAA717X)

            

        
			return -EINVAL;
			return -EINVAL;

        
		if (!capable(CAP_SYS_ADMIN))
		if (!capable(CAP_SYS_ADMIN))

        
			return -EPERM;
			return -EPERM;