diff for duplicates of <20201129012653.GA27872@abuya> diff --git a/a/1.txt b/N1/1.txt index 926ec2f..00a7ac1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -136,7 +136,7 @@ On 27/Nov/2020 21:34, Christophe JAILLET wrote: > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > If needed, see post from Christoph Hellwig on the kernel-janitors ML: -> https://marc.info/?l=kernel-janitors&m\x158745678307186&w=4 +> https://marc.info/?l=kernel-janitors&m=158745678307186&w=4 > --- > drivers/media/pci/solo6x10/solo6x10-g723.c | 11 +++--- > drivers/media/pci/solo6x10/solo6x10-p2m.c | 10 +++--- @@ -148,7 +148,7 @@ On 27/Nov/2020 21:34, Christophe JAILLET wrote: > --- a/drivers/media/pci/solo6x10/solo6x10-g723.c > +++ b/drivers/media/pci/solo6x10/solo6x10-g723.c > @@ -124,9 +124,10 @@ static int snd_solo_pcm_open(struct snd_pcm_substream *ss) -> if (solo_pcm = NULL) +> if (solo_pcm == NULL) > goto oom; > > - solo_pcm->g723_buf = pci_alloc_consistent(solo_dev->pdev, @@ -158,7 +158,7 @@ On 27/Nov/2020 21:34, Christophe JAILLET wrote: > + G723_PERIOD_BYTES, > + &solo_pcm->g723_dma, > + GFP_KERNEL); -> if (solo_pcm->g723_buf = NULL) +> if (solo_pcm->g723_buf == NULL) > goto oom; > > @@ -148,8 +149,8 @@ static int snd_solo_pcm_close(struct snd_pcm_substream *ss) @@ -216,7 +216,7 @@ On 27/Nov/2020 21:34, Christophe JAILLET wrote: > + &solo_enc->desc_dma, > + GFP_KERNEL); > ret = -ENOMEM; -> if (solo_enc->desc_items = NULL) +> if (solo_enc->desc_items == NULL) > goto hdl_free; > @@ -1317,9 +1318,9 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev, > vdev_release: @@ -232,7 +232,7 @@ On 27/Nov/2020 21:34, Christophe JAILLET wrote: > v4l2_ctrl_handler_free(hdl); > kfree(solo_enc); > @@ -1331,9 +1332,9 @@ static void solo_enc_free(struct solo_enc_dev *solo_enc) -> if (solo_enc = NULL) +> if (solo_enc == NULL) > return; > > - pci_free_consistent(solo_enc->solo_dev->pdev, @@ -254,7 +254,7 @@ On 27/Nov/2020 21:34, Christophe JAILLET wrote: > + solo_dev->vh_buf = dma_alloc_coherent(&solo_dev->pdev->dev, > + solo_dev->vh_size, > + &solo_dev->vh_dma, GFP_KERNEL); -> if (solo_dev->vh_buf = NULL) +> if (solo_dev->vh_buf == NULL) > return -ENOMEM; > > @@ -1363,8 +1364,8 @@ int solo_enc_v4l2_init(struct solo_dev *solo_dev, unsigned nr) diff --git a/a/content_digest b/N1/content_digest index 60cdfdf..beb6d75 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020201127203440.1381359-1-christophe.jaillet@wanadoo.fr\0" "From\0Ismael Luceno <ismael@iodev.co.uk>\0" "Subject\0Re: [PATCH] media: solo6x10: switch from 'pci_' to 'dma_' API\0" - "Date\0Sun, 29 Nov 2020 01:26:53 +0000\0" + "Date\0Sun, 29 Nov 2020 02:26:53 +0100\0" "To\0Christophe JAILLET <christophe.jaillet@wanadoo.fr>\0" "Cc\0maintainers@bluecherrydvr.com" anton@corp.bluecherry.net @@ -150,7 +150,7 @@ "> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>\n" "> ---\n" "> If needed, see post from Christoph Hellwig on the kernel-janitors ML:\n" - "> https://marc.info/?l=kernel-janitors&m\0258745678307186&w=4\n" + "> https://marc.info/?l=kernel-janitors&m=158745678307186&w=4\n" "> ---\n" "> drivers/media/pci/solo6x10/solo6x10-g723.c | 11 +++---\n" "> drivers/media/pci/solo6x10/solo6x10-p2m.c | 10 +++---\n" @@ -162,7 +162,7 @@ "> --- a/drivers/media/pci/solo6x10/solo6x10-g723.c\n" "> +++ b/drivers/media/pci/solo6x10/solo6x10-g723.c\n" "> @@ -124,9 +124,10 @@ static int snd_solo_pcm_open(struct snd_pcm_substream *ss)\n" - "> \tif (solo_pcm = NULL)\n" + "> \tif (solo_pcm == NULL)\n" "> \t\tgoto oom;\n" "> \n" "> -\tsolo_pcm->g723_buf = pci_alloc_consistent(solo_dev->pdev,\n" @@ -172,7 +172,7 @@ "> +\t\t\t\t\t\tG723_PERIOD_BYTES,\n" "> +\t\t\t\t\t\t&solo_pcm->g723_dma,\n" "> +\t\t\t\t\t\tGFP_KERNEL);\n" - "> \tif (solo_pcm->g723_buf = NULL)\n" + "> \tif (solo_pcm->g723_buf == NULL)\n" "> \t\tgoto oom;\n" "> \n" "> @@ -148,8 +149,8 @@ static int snd_solo_pcm_close(struct snd_pcm_substream *ss)\n" @@ -230,7 +230,7 @@ "> +\t\t\t\t\t\t &solo_enc->desc_dma,\n" "> +\t\t\t\t\t\t GFP_KERNEL);\n" "> \tret = -ENOMEM;\n" - "> \tif (solo_enc->desc_items = NULL)\n" + "> \tif (solo_enc->desc_items == NULL)\n" "> \t\tgoto hdl_free;\n" "> @@ -1317,9 +1318,9 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev,\n" "> vdev_release:\n" @@ -246,7 +246,7 @@ "> \tv4l2_ctrl_handler_free(hdl);\n" "> \tkfree(solo_enc);\n" "> @@ -1331,9 +1332,9 @@ static void solo_enc_free(struct solo_enc_dev *solo_enc)\n" - "> \tif (solo_enc = NULL)\n" + "> \tif (solo_enc == NULL)\n" "> \t\treturn;\n" "> \n" "> -\tpci_free_consistent(solo_enc->solo_dev->pdev,\n" @@ -268,7 +268,7 @@ "> +\tsolo_dev->vh_buf = dma_alloc_coherent(&solo_dev->pdev->dev,\n" "> +\t\t\t\t\t solo_dev->vh_size,\n" "> +\t\t\t\t\t &solo_dev->vh_dma, GFP_KERNEL);\n" - "> \tif (solo_dev->vh_buf = NULL)\n" + "> \tif (solo_dev->vh_buf == NULL)\n" "> \t\treturn -ENOMEM;\n" "> \n" "> @@ -1363,8 +1364,8 @@ int solo_enc_v4l2_init(struct solo_dev *solo_dev, unsigned nr)\n" @@ -297,4 +297,4 @@ "\n" Signed-off-by: Ismael Luceno <ismael@iodev.co.uk> -c5f8693a77cc51d3920f3643169d53855269283bf0a8c1c98a30f8545e01eb01 +46fe0eaf03f7dee43182fdd67be2f46761f266840f0605e5f14d9d0768900a6a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.