From fe2b11ab366575d1fe072d7822b056b0763aea84 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 17 Jul 2012 13:34:18 -0400 Subject: [PATCH] --- yaml --- r: 320727 b: refs/heads/master c: d38a0149e8a11ca333c1a6c489a2ccac2b73f2cb h: refs/heads/master i: 320725: 9803b3ecda34c862adefa4e3d002cdec6f54465b 320723: 3696a572cde5178b6092c30351ea0e90e91d2bb4 320719: ef2a993029cd31e3ab41019d40a58a534a989119 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-pmcmsp.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7e83acd5fde7..a3f2f49df011 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5d600f874e7d73c5ccfa37072f883701ade668d +refs/heads/master: d38a0149e8a11ca333c1a6c489a2ccac2b73f2cb diff --git a/trunk/drivers/i2c/busses/i2c-pmcmsp.c b/trunk/drivers/i2c/busses/i2c-pmcmsp.c index 07b7447ecbc9..3d71395ae1f7 100644 --- a/trunk/drivers/i2c/busses/i2c-pmcmsp.c +++ b/trunk/drivers/i2c/busses/i2c-pmcmsp.c @@ -306,8 +306,7 @@ static int __devinit pmcmsptwi_probe(struct platform_device *pldev) pmcmsptwi_data.irq = platform_get_irq(pldev, 0); if (pmcmsptwi_data.irq) { rc = request_irq(pmcmsptwi_data.irq, &pmcmsptwi_interrupt, - IRQF_SHARED | IRQF_SAMPLE_RANDOM, - pldev->name, &pmcmsptwi_data); + IRQF_SHARED, pldev->name, &pmcmsptwi_data); if (rc == 0) { /* * Enable 'DONE' interrupt only.