Commit 7ff5b87a authored by openeuler-sync-bot's avatar openeuler-sync-bot
Browse files

Merge remote-tracking branch 'upstream/openEuler-22.03-LTS-SP1' into HEAD

parents 9918e2cc 8f2430d6

drivers/gpu/drm/bridge/ti-tpd12s015.c

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static int tpd12s015_probe(struct platform_device *pdev) 
	return 0;

}



static int __exit tpd12s015_remove(struct platform_device *pdev)

static int tpd12s015_remove(struct platform_device *pdev)

{

	struct tpd12s015_device *tpd = platform_get_drvdata(pdev);
@@ -197,7 +197,7 @@ MODULE_DEVICE_TABLE(of, tpd12s015_of_match); 


static struct platform_driver tpd12s015_driver = {

	.probe	= tpd12s015_probe,

	.remove	= __exit_p(tpd12s015_remove),

	.remove = tpd12s015_remove,

	.driver	= {

		.name	= "tpd12s015",

		.of_match_table = tpd12s015_of_match,

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ void hclge_ptp_get_rx_hwts(struct hnae3_handle *handle, struct sk_buff *skb, 
	u64 ns = nsec;

	u32 sec_h;



	if (!test_bit(HCLGE_PTP_FLAG_RX_EN, &hdev->ptp->flags))

	if (!hdev->ptp || !test_bit(HCLGE_PTP_FLAG_RX_EN, &hdev->ptp->flags))

		return;



	/* Since the BD does not have enough space for the higher 16 bits of

fs/btrfs/backref.c

+3 −9
Original line number Diff line number Diff line
@@ -2262,20 +2262,14 @@ struct btrfs_data_container *init_data_container(u32 total_bytes) 
	size_t alloc_bytes;



	alloc_bytes = max_t(size_t, total_bytes, sizeof(*data));

	data = kvmalloc(alloc_bytes, GFP_KERNEL);

	data = kvzalloc(alloc_bytes, GFP_KERNEL);

	if (!data)

		return ERR_PTR(-ENOMEM);



	if (total_bytes >= sizeof(*data)) {

	if (total_bytes >= sizeof(*data))

		data->bytes_left = total_bytes - sizeof(*data);

		data->bytes_missing = 0;

	} else {

	else

		data->bytes_missing = sizeof(*data) - total_bytes;

		data->bytes_left = 0;

	}



	data->elem_cnt = 0;

	data->elem_missed = 0;



	return data;

}