Commit debdd8e3 authored by Jonathan Lemon's avatar Jonathan Lemon Committed by David S. Miller
Browse files

ptp: Relocate lookup cookie to correct block. 



An earlier commit set the pps_lookup cookie, but the line
was somehow added to the wrong code block.  Correct this.

Fixes: 8602e40f ("ptp: Set lookup cookie when creating a PTP PPS source.")
Signed-off-by: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: default avatarDario Binacchi <dariobin@libero.it>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c7bb4b89

drivers/ptp/ptp_clock.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -232,7 +232,6 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, 
			pr_err("failed to create ptp aux_worker %d\n", err);

			pr_err("failed to create ptp aux_worker %d\n", err);

			goto kworker_err;

			goto kworker_err;

		}

		}

		ptp->pps_source->lookup_cookie = ptp;

	}

	}





	/* PTP virtual clock is being registered under physical clock */

	/* PTP virtual clock is being registered under physical clock */
@@ -268,6 +267,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, 
			pr_err("failed to register pps source\n");

			pr_err("failed to register pps source\n");

			goto no_pps;

			goto no_pps;

		}

		}

		ptp->pps_source->lookup_cookie = ptp;

	}

	}





	/* Initialize a new device of our class in our clock structure. */

	/* Initialize a new device of our class in our clock structure. */