diff for duplicates of <20101019055748.GE5839@bicker> diff --git a/a/1.txt b/N1/1.txt index d2983f5..acb120b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,8 +21,7 @@ index 8390aa7..d20724d 100644 } case _IOC_NR(SNDRV_SST_STREAM_DECODE): { -- struct snd_sst_dbufs *param = -- (struct snd_sst_dbufs *)arg, dbufs_local; +- struct snd_sst_dbufs *param - (struct snd_sst_dbufs *)arg, dbufs_local; - int i; + struct snd_sst_dbufs param; + struct snd_sst_dbufs dbufs_local; @@ -47,8 +46,7 @@ index 8390aa7..d20724d 100644 - dbufs_local.input_bytes_consumed = param->input_bytes_consumed; + dbufs_local.input_bytes_consumed = param.input_bytes_consumed; - dbufs_local.output_bytes_produced = -- param->output_bytes_produced; + dbufs_local.output_bytes_produced - param->output_bytes_produced; - dbufs_local.ibufs = &ibufs; - dbufs_local.obufs = &obufs; - dbufs_local.ibufs->entries = param->ibufs->entries; @@ -58,10 +56,8 @@ index 8390aa7..d20724d 100644 - - dbufs_local.ibufs->buff_entry = ibuf_temp; - for (i = 0; i < dbufs_local.ibufs->entries; i++) { -- ibuf_temp[i].buffer = -- param->ibufs->buff_entry[i].buffer; -- ibuf_temp[i].size = -- param->ibufs->buff_entry[i].size; +- ibuf_temp[i].buffer - param->ibufs->buff_entry[i].buffer; +- ibuf_temp[i].size - param->ibufs->buff_entry[i].size; + param.output_bytes_produced; + + if (copy_from_user(&ibufs, param.ibufs, sizeof(ibufs))) { @@ -87,10 +83,8 @@ index 8390aa7..d20724d 100644 } - dbufs_local.obufs->buff_entry = obuf_temp; - for (i = 0; i < dbufs_local.obufs->entries; i++) { -- obuf_temp[i].buffer = -- param->obufs->buff_entry[i].buffer; -- obuf_temp[i].size = -- param->obufs->buff_entry[i].size; +- obuf_temp[i].buffer - param->obufs->buff_entry[i].buffer; +- obuf_temp[i].size - param->obufs->buff_entry[i].size; + ibufs.buff_entry = ibuf_tmp; + dbufs_local.ibufs = &ibufs; + diff --git a/a/content_digest b/N1/content_digest index 451e09f..d3091b1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0[patch 3/3] Staging: sst: fixups in SNDRV_SST_STREAM_DECODE\0" - "Date\0Tue, 19 Oct 2010 07:57:48 +0200\0" + "Date\0Tue, 19 Oct 2010 05:57:48 +0000\0" "To\0Greg Kroah-Hartman <gregkh@suse.de>\0" "Cc\0Vinod Koul <vinod.koul@intel.com>" devel@driverdev.osuosl.org @@ -32,8 +32,7 @@ " \t}\n" " \n" " \tcase _IOC_NR(SNDRV_SST_STREAM_DECODE): {\n" - "-\t\tstruct snd_sst_dbufs *param =\n" - "-\t\t\t\t(struct snd_sst_dbufs *)arg, dbufs_local;\n" + "-\t\tstruct snd_sst_dbufs *param -\t\t\t\t(struct snd_sst_dbufs *)arg, dbufs_local;\n" "-\t\tint i;\n" "+\t\tstruct snd_sst_dbufs param;\n" "+\t\tstruct snd_sst_dbufs dbufs_local;\n" @@ -58,8 +57,7 @@ " \n" "-\t\tdbufs_local.input_bytes_consumed = param->input_bytes_consumed;\n" "+\t\tdbufs_local.input_bytes_consumed = param.input_bytes_consumed;\n" - " \t\tdbufs_local.output_bytes_produced =\n" - "-\t\t\t\t\tparam->output_bytes_produced;\n" + " \t\tdbufs_local.output_bytes_produced -\t\t\t\t\tparam->output_bytes_produced;\n" "-\t\tdbufs_local.ibufs = &ibufs;\n" "-\t\tdbufs_local.obufs = &obufs;\n" "-\t\tdbufs_local.ibufs->entries = param->ibufs->entries;\n" @@ -69,10 +67,8 @@ "-\n" "-\t\tdbufs_local.ibufs->buff_entry = ibuf_temp;\n" "-\t\tfor (i = 0; i < dbufs_local.ibufs->entries; i++) {\n" - "-\t\t\tibuf_temp[i].buffer =\n" - "-\t\t\t\tparam->ibufs->buff_entry[i].buffer;\n" - "-\t\t\tibuf_temp[i].size =\n" - "-\t\t\t\tparam->ibufs->buff_entry[i].size;\n" + "-\t\t\tibuf_temp[i].buffer -\t\t\t\tparam->ibufs->buff_entry[i].buffer;\n" + "-\t\t\tibuf_temp[i].size -\t\t\t\tparam->ibufs->buff_entry[i].size;\n" "+\t\t\t\t\tparam.output_bytes_produced;\n" "+\n" "+\t\tif (copy_from_user(&ibufs, param.ibufs, sizeof(ibufs))) {\n" @@ -98,10 +94,8 @@ " \t\t}\n" "-\t\tdbufs_local.obufs->buff_entry = obuf_temp;\n" "-\t\tfor (i = 0; i < dbufs_local.obufs->entries; i++) {\n" - "-\t\t\tobuf_temp[i].buffer =\n" - "-\t\t\t\tparam->obufs->buff_entry[i].buffer;\n" - "-\t\t\tobuf_temp[i].size =\n" - "-\t\t\t\tparam->obufs->buff_entry[i].size;\n" + "-\t\t\tobuf_temp[i].buffer -\t\t\t\tparam->obufs->buff_entry[i].buffer;\n" + "-\t\t\tobuf_temp[i].size -\t\t\t\tparam->obufs->buff_entry[i].size;\n" "+\t\tibufs.buff_entry = ibuf_tmp;\n" "+\t\tdbufs_local.ibufs = &ibufs;\n" "+\n" @@ -148,4 +142,4 @@ " \t\tbreak;\n" " \t}" -36655bc1c8ea94f2ebad00d36b14c13f34a4549a630c1bc93ab319949e64c383 +e169e0556c5028335ddcad3c0508155901d644a044b6d65c10969b05fb8c908c
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.