Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from torvalds:master #1

Merged
merged 23 commits into from
Nov 14, 2018
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5841734
scsi: target/core: Avoid that a kernel oops is triggered when COMPARE…
bvanassche Nov 6, 2018
f8f4adc
scsi: myrb: fix sprintf buffer overflow warning
arndb Nov 2, 2018
f8d2943
scsi: lpfc: fix remoteport access
arndb Nov 2, 2018
77409c4
scsi: myrs: avoid stack overflow warning
arndb Nov 2, 2018
a3ecf48
scsi: myrs: only build on little-endian platforms
arndb Nov 2, 2018
e34ff8e
scsi: hisi_sas: Remove set but not used variable 'dq_list'
Oct 26, 2018
0d52e64
scsi: qla2xxx: Fix a typo in MODULE_PARM_DESC
standby24x7 Oct 28, 2018
96edebd
scsi: NCR5380: Return false instead of NULL
Oct 24, 2018
86d4d06
parisc: Revert "Release spinlocks using ordered store"
danglin44 Nov 6, 2018
aca49ee
Revert "scsi: ufs: Disable blk-mq for now"
martinkpetersen Nov 6, 2018
f635e48
scsi: qla2xxx: Initialize port speed to avoid setting lower speed
Nov 6, 2018
fbb974b
rtc: cmos: Do not export alarm rtc_ops when we do not support alarms
jwrdegoede Sep 4, 2018
7ce9a99
rtc: hctosys: Add missing range error reporting
Nov 5, 2018
9bde0af
rtc: pcf2127: fix a kmemleak caused in pcf2127_i2c_gather_write
xulinsun Nov 6, 2018
1e9c75f
mnt: fix __detach_mounts infinite loop
bcodding-rh Oct 3, 2018
5df7a99
ARM: 8810/1: vfp: Fix wrong assignement to ufp_exc
Nov 8, 2018
0d76bcc
Revert "ACPI/PCI: Pay attention to device-specific _PXM node values"
bjorn-helgaas Nov 13, 2018
e2f8b47
Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm
torvalds Nov 14, 2018
857c34c
Merge branch 'parisc-4.20-3' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Nov 14, 2018
47e624c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Nov 14, 2018
b7bbf99
Merge tag 'rtc-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/g…
torvalds Nov 14, 2018
dbcec2e
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g…
torvalds Nov 14, 2018
d41217a
Merge tag 'pci-v4.20-fixes-1' of git://git.kernel.org/pub/scm/linux/k…
torvalds Nov 14, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion drivers/rtc/hctosys.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@ static int __init rtc_hctosys(void)
tv64.tv_sec = rtc_tm_to_time64(&tm);

#if BITS_PER_LONG == 32
if (tv64.tv_sec > INT_MAX)
if (tv64.tv_sec > INT_MAX) {
err = -ERANGE;
goto err_read;
}
#endif

err = do_settimeofday64(&tv64);
Expand Down
16 changes: 12 additions & 4 deletions drivers/rtc/rtc-cmos.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ static int cmos_read_alarm(struct device *dev, struct rtc_wkalrm *t)
struct cmos_rtc *cmos = dev_get_drvdata(dev);
unsigned char rtc_control;

/* This not only a rtc_op, but also called directly */
if (!is_valid_irq(cmos->irq))
return -EIO;

Expand Down Expand Up @@ -452,6 +453,7 @@ static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t)
unsigned char mon, mday, hrs, min, sec, rtc_control;
int ret;

/* This not only a rtc_op, but also called directly */
if (!is_valid_irq(cmos->irq))
return -EIO;

Expand Down Expand Up @@ -516,9 +518,6 @@ static int cmos_alarm_irq_enable(struct device *dev, unsigned int enabled)
struct cmos_rtc *cmos = dev_get_drvdata(dev);
unsigned long flags;

if (!is_valid_irq(cmos->irq))
return -EINVAL;

spin_lock_irqsave(&rtc_lock, flags);

if (enabled)
Expand Down Expand Up @@ -579,6 +578,12 @@ static const struct rtc_class_ops cmos_rtc_ops = {
.alarm_irq_enable = cmos_alarm_irq_enable,
};

static const struct rtc_class_ops cmos_rtc_ops_no_alarm = {
.read_time = cmos_read_time,
.set_time = cmos_set_time,
.proc = cmos_procfs,
};

/*----------------------------------------------------------------*/

/*
Expand Down Expand Up @@ -855,9 +860,12 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
dev_dbg(dev, "IRQ %d is already in use\n", rtc_irq);
goto cleanup1;
}

cmos_rtc.rtc->ops = &cmos_rtc_ops;
} else {
cmos_rtc.rtc->ops = &cmos_rtc_ops_no_alarm;
}

cmos_rtc.rtc->ops = &cmos_rtc_ops;
cmos_rtc.rtc->nvram_old_abi = true;
retval = rtc_register_device(cmos_rtc.rtc);
if (retval)
Expand Down
3 changes: 3 additions & 0 deletions drivers/rtc/rtc-pcf2127.c
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,9 @@ static int pcf2127_i2c_gather_write(void *context,
memcpy(buf + 1, val, val_size);

ret = i2c_master_send(client, buf, val_size + 1);

kfree(buf);

if (ret != val_size + 1)
return ret < 0 ? ret : -EIO;

Expand Down