Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6

[cascardo/linux.git] / drivers / ptp / ptp_chardev.c

diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index 419056d..f8a7609 100644 (file)
--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -86,17 +86,12 @@ int ptp_set_pinfunc(struct ptp_clock *ptp, unsigned int pin,
                        return -EINVAL;
                break;
        case PTP_PF_PHYSYNC:
-               pr_err("sorry, cannot reassign the calibration pin\n");
-               return -EINVAL;
+               if (chan != 0)
+                       return -EINVAL;
        default:
                return -EINVAL;
        }
 
-       if (pin2->func == PTP_PF_PHYSYNC) {
-               pr_err("sorry, cannot reprogram the calibration pin\n");
-               return -EINVAL;
-       }
-
        if (info->verify(info, pin, func, chan)) {
                pr_err("driver cannot use function %u on pin %u\n", func, chan);
                return -EOPNOTSUPP;