~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/watchdog/wm831x_wdt.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
320
320
        struct wm831x_watchdog_pdata *pdata;
321
321
        int reg, ret;
322
322
 
 
323
        if (wm831x) {
 
324
                dev_err(&pdev->dev, "wm831x watchdog already registered\n");
 
325
                return -EBUSY;
 
326
        }
 
327
 
323
328
        wm831x = dev_get_drvdata(pdev->dev.parent);
324
329
 
325
330
        ret = wm831x_reg_read(wm831x, WM831X_WATCHDOG);