714-3.3-wdt-fixes.patch 1.4 KB

12345678910111213141516171819202122232425262728293031
  1. --- a/Embedded/src/WDT/iwdt.c
  2. +++ b/Embedded/src/WDT/iwdt.c
  3. @@ -217,8 +217,7 @@ static int wdt_open(struct inode *inode,
  4. static int wdt_release(struct inode *inode, struct file *file);
  5. static ssize_t wdt_write(struct file *file, const char *data,
  6. size_t count, loff_t * pos);
  7. -static int wdt_ioctl(struct inode *inode, struct file *file,
  8. - unsigned int cmd, unsigned long arg);
  9. +static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
  10. static irqreturn_t wdt_isr(int irq, void *dev_id);
  11. static void __exit wdt_cleanup(void);
  12. static int __init wdt_init(void);
  13. @@ -243,7 +242,7 @@ static struct pci_device_id lpc_pci_tbl[
  14. static struct file_operations wdt_fops = {
  15. owner: THIS_MODULE,
  16. write: wdt_write,
  17. - ioctl: wdt_ioctl,
  18. + unlocked_ioctl: wdt_ioctl,
  19. open: wdt_open,
  20. release: wdt_release,
  21. };
  22. @@ -1201,8 +1200,7 @@ char *wdt_get_ioctl_string(unsigned int
  23. * Return Value: 0 - successful, negative value - failed.
  24. * Description: This function is used to provide IO interface.
  25. */
  26. -static int wdt_ioctl(struct inode *inode, struct file *file,
  27. - unsigned int cmd, unsigned long arg)
  28. +static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
  29. {
  30. u8 mode=0, scale=0, int_type=0;
  31. u32 u_margin=0, dcount=0;