diff options
Diffstat (limited to 'drivers/watchdog/mpc5200_wdt.c')
-rw-r--r-- | drivers/watchdog/mpc5200_wdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/mpc5200_wdt.c b/drivers/watchdog/mpc5200_wdt.c index ce1811d5d6b1..db91892558f2 100644 --- a/drivers/watchdog/mpc5200_wdt.c +++ b/drivers/watchdog/mpc5200_wdt.c | |||
@@ -164,7 +164,7 @@ static int mpc5200_wdt_release(struct inode *inode, struct file *file) | |||
164 | static const struct file_operations mpc5200_wdt_fops = { | 164 | static const struct file_operations mpc5200_wdt_fops = { |
165 | .owner = THIS_MODULE, | 165 | .owner = THIS_MODULE, |
166 | .write = mpc5200_wdt_write, | 166 | .write = mpc5200_wdt_write, |
167 | .ioctl = mpc5200_wdt_ioctl, | 167 | .unlocked_ioctl = mpc5200_wdt_ioctl, |
168 | .open = mpc5200_wdt_open, | 168 | .open = mpc5200_wdt_open, |
169 | .release = mpc5200_wdt_release, | 169 | .release = mpc5200_wdt_release, |
170 | }; | 170 | }; |
@@ -219,9 +219,9 @@ static int mpc5200_wdt_probe(struct of_device *op, | |||
219 | return 0; | 219 | return 0; |
220 | 220 | ||
221 | iounmap(wdt->regs); | 221 | iounmap(wdt->regs); |
222 | out_release: | 222 | out_release: |
223 | release_mem_region(wdt->mem.start, size); | 223 | release_mem_region(wdt->mem.start, size); |
224 | out_free: | 224 | out_free: |
225 | kfree(wdt); | 225 | kfree(wdt); |
226 | return err; | 226 | return err; |
227 | } | 227 | } |