From 873aa73d5eba55e2153c711e5b6eb5afa470ef3b Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Wed, 22 May 2013 23:59:28 +0000 Subject: [PATCH] --- yaml --- r: 376625 b: refs/heads/master c: 0d8c3e77e7fba8c84c871b43f35029daa92acc17 h: refs/heads/master i: 376623: c51075055562ff6f892926febc8b2f8a5ccc5ee1 v: v3 --- [refs] | 2 +- trunk/drivers/ptp/ptp_pch.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1c2a6ce12fe8..bfb45942c8e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d2593cc65fa15f2a36313aa8d03a0937226ad49 +refs/heads/master: 0d8c3e77e7fba8c84c871b43f35029daa92acc17 diff --git a/trunk/drivers/ptp/ptp_pch.c b/trunk/drivers/ptp/ptp_pch.c index bea94510ad2d..71a2559278d7 100644 --- a/trunk/drivers/ptp/ptp_pch.c +++ b/trunk/drivers/ptp/ptp_pch.c @@ -628,9 +628,10 @@ pch_probe(struct pci_dev *pdev, const struct pci_device_id *id) chip->caps = ptp_pch_caps; chip->ptp_clock = ptp_clock_register(&chip->caps, &pdev->dev); - - if (IS_ERR(chip->ptp_clock)) - return PTR_ERR(chip->ptp_clock); + if (IS_ERR(chip->ptp_clock)) { + ret = PTR_ERR(chip->ptp_clock); + goto err_ptp_clock_reg; + } spin_lock_init(&chip->register_lock); @@ -669,6 +670,7 @@ pch_probe(struct pci_dev *pdev, const struct pci_device_id *id) err_req_irq: ptp_clock_unregister(chip->ptp_clock); +err_ptp_clock_reg: iounmap(chip->regs); chip->regs = NULL;