diff options
| author | Tejun Heo <tj@kernel.org> | 2013-06-13 22:38:26 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-06-13 22:42:22 -0400 |
| commit | 2b0e53a7c8a6972755c0f0152d7fad2289fdc5eb (patch) | |
| tree | bf427cbe4b9d85cd5651b01f2f18668e8d12ed45 /drivers/usb/host/isp1760-if.c | |
| parent | ea15f8ccdb430af1e8bc9b4e19a230eb4c356777 (diff) | |
| parent | dbece3a0f1ef0b19aff1cc6ed0942fec9ab98de1 (diff) | |
Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into for-3.11
This is to receive percpu_refcount which will replace atomic_t
reference count in cgroup_subsys_state.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/usb/host/isp1760-if.c')
| -rw-r--r-- | drivers/usb/host/isp1760-if.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c index bbb791bd7617..a13709ee4e5d 100644 --- a/drivers/usb/host/isp1760-if.c +++ b/drivers/usb/host/isp1760-if.c | |||
| @@ -373,8 +373,10 @@ static int isp1760_plat_probe(struct platform_device *pdev) | |||
| 373 | irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); | 373 | irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); |
| 374 | if (!irq_res) { | 374 | if (!irq_res) { |
| 375 | pr_warning("isp1760: IRQ resource not available\n"); | 375 | pr_warning("isp1760: IRQ resource not available\n"); |
| 376 | return -ENODEV; | 376 | ret = -ENODEV; |
| 377 | goto cleanup; | ||
| 377 | } | 378 | } |
| 379 | |||
| 378 | irqflags |= irq_res->flags & IRQF_TRIGGER_MASK; | 380 | irqflags |= irq_res->flags & IRQF_TRIGGER_MASK; |
| 379 | 381 | ||
| 380 | if (priv) { | 382 | if (priv) { |
