← Back to branch summary

~ubuntu-branches/debian/experimental/linux-2.6/experimental

« back to all changes in this revision

Viewing changes to drivers/regulator/wm831x-ldo.c

  • Committer: Package Import Robot
  • Author(s): maximilian attems, maximilian attems, Ben Hutchings
  • Date: 2012-06-06 10:25:57 UTC
  • mfrom: (1.2.38)
  • Revision ID: package-import@ubuntu.com-20120606102557-b9j3506wcwrqrnx8
Tags: 3.4.1-1~experimental.1
* New upstream release: http://kernelnewbies.org/Linux_3.4
* New upstream stable update:
  http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.1

[ maximilian attems ]
* Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
  IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
  NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO,
  NET_TEAM, ATH6KL.

[ Ben Hutchings ]
* DFSG: Remove the new vs6624 driver, which contains non-free firmware
* aufs: Update to aufs3.4-20120521
* [rt] Update to 3.4-rt8 and reenable

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/regulator/wm831x-ldo.c
506
506
{
507
507
        struct wm831x_ldo *ldo = rdev_get_drvdata(rdev);
508
508
        struct wm831x *wm831x = ldo->wm831x;
509
 
        int ctrl_reg = ldo->base + WM831X_LDO_CONTROL;
510
509
        int on_reg = ldo->base + WM831X_LDO_ON_CONTROL;
511
510
        int ret;
512
511
 
513
512
 
514
513
        switch (mode) {
515
514
        case REGULATOR_MODE_NORMAL:
516
 
                ret = wm831x_set_bits(wm831x, on_reg,
517
 
                                      WM831X_LDO7_ON_MODE, 0);
 
515
                ret = wm831x_set_bits(wm831x, on_reg, WM831X_LDO7_ON_MODE, 0);
518
516
                if (ret < 0)
519
517
                        return ret;
520
518
                break;
521
519
 
522
520
        case REGULATOR_MODE_IDLE:
523
 
                ret = wm831x_set_bits(wm831x, ctrl_reg,
524
 
                                      WM831X_LDO7_ON_MODE,
 
521
                ret = wm831x_set_bits(wm831x, on_reg, WM831X_LDO7_ON_MODE,
525
522
                                      WM831X_LDO7_ON_MODE);
526
523
                if (ret < 0)
527
524
                        return ret;