Pastebin launched a little side project called HostCabi.net, check it out ;-)Don't like ads? PRO users don't see any ads ;-)
Guest

hsfmodem-7.80.02.06full.patch

By: a guest on Dec 24th, 2010  |  syntax: Diff  |  size: 10.33 KB  |  hits: 396  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_codec.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_codec.c
  2. --- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_codec.c     2008-05-09 07:34:30.000000000 +0300
  3. +++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_codec.c   2010-12-24 15:49:34.000000000 +0200
  4. @@ -19,7 +19,6 @@
  5.   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  6.   */
  7.  
  8. -#include <sound/driver.h>
  9.  #include <linux/init.h>
  10.  #include <linux/delay.h>
  11.  #include <linux/slab.h>
  12. @@ -194,7 +193,7 @@ int snd_hda_get_connections(struct hda_c
  13.         unsigned int shift, num_elems, mask;
  14.         hda_nid_t prev_nid;
  15.  
  16. -       snd_assert(conn_list && max_conns > 0, return -EINVAL);
  17. +       if (snd_BUG_ON(!(conn_list && max_conns > 0))) { return -EINVAL; };
  18.  
  19.         parm = snd_hda_param_read(codec, nid, AC_PAR_CONNLIST_LEN);
  20.         if (parm & AC_CLIST_LONG) {
  21. @@ -439,8 +438,8 @@ int snd_hda_bus_new(struct snd_card *car
  22.         };
  23.  
  24.  //printk(KERN_ERR"%s: card=%p\n", __FUNCTION__, card);
  25. -       snd_assert(temp, return -EINVAL);
  26. -       snd_assert(temp->ops.command && temp->ops.get_response, return -EINVAL);
  27. +       if (snd_BUG_ON(!(temp))) { return -EINVAL; };
  28. +       if (snd_BUG_ON(!(temp->ops.command && temp->ops.get_response))) { return -EINVAL; };
  29.  
  30.         if (busp)
  31.                 *busp = NULL;
  32. @@ -604,8 +603,8 @@ int snd_hda_codec_new(struct hda_bus *bu
  33.         char component[13];
  34.         int err;
  35.  
  36. -       snd_assert(bus, return -EINVAL);
  37. -       snd_assert(codec_addr <= HDA_MAX_CODEC_ADDRESS, return -EINVAL);
  38. +       if (snd_BUG_ON(!(bus))) { return -EINVAL; };
  39. +       if (snd_BUG_ON(!(codec_addr <= HDA_MAX_CODEC_ADDRESS))) { return -EINVAL; };
  40.  
  41.         if (bus->caddr_tbl[codec_addr]) {
  42.                 snd_printk(KERN_ERR "hda_codec: address 0x%x is already occupied\n", codec_addr);
  43. @@ -1750,11 +1749,11 @@ static int set_pcm_default_values(struct
  44.         if (info->ops.close == NULL)
  45.                 info->ops.close = hda_pcm_default_open_close;
  46.         if (info->ops.prepare == NULL) {
  47. -               snd_assert(info->nid, return -EINVAL);
  48. +               if (snd_BUG_ON(!(info->nid))) { return -EINVAL; };
  49.                 info->ops.prepare = hda_pcm_default_prepare;
  50.         }
  51.         if (info->ops.cleanup == NULL) {
  52. -               snd_assert(info->nid, return -EINVAL);
  53. +               if (snd_BUG_ON(!(info->nid))) { return -EINVAL; };
  54.                 info->ops.cleanup = hda_pcm_default_cleanup;
  55.         }
  56.         return 0;
  57. @@ -1944,7 +1943,7 @@ int snd_hda_ch_mode_put(struct hda_codec
  58.         unsigned int mode;
  59.  
  60.         mode = ucontrol->value.enumerated.item[0];
  61. -       snd_assert(mode < num_chmodes, return -EINVAL);
  62. +       if (snd_BUG_ON(!(mode < num_chmodes))) { return -EINVAL; };
  63.         if (*max_channelsp == chmode[mode].channels && ! codec->in_resume)
  64.                 return 0;
  65.         /* change the current channel setting */
  66. diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_generic.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_generic.c
  67. --- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_generic.c   2007-04-13 07:01:17.000000000 +0300
  68. +++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_generic.c 2010-12-24 15:49:34.000000000 +0200
  69. @@ -20,7 +20,6 @@
  70.   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  71.   */
  72.  
  73. -#include <sound/driver.h>
  74.  #include <linux/init.h>
  75.  #include <linux/slab.h>
  76.  #include <linux/pci.h>
  77. @@ -170,7 +169,7 @@ static int build_afg_tree(struct hda_cod
  78.         int i, nodes, err;
  79.         hda_nid_t nid;
  80.  
  81. -       snd_assert(spec, return -EINVAL);
  82. +       if (snd_BUG_ON(!(spec))) { return -EINVAL; };
  83.  
  84.         spec->def_amp_out_caps = snd_hda_param_read(codec, codec->afg, AC_PAR_AMP_OUT_CAP);
  85.         spec->def_amp_in_caps = snd_hda_param_read(codec, codec->afg, AC_PAR_AMP_IN_CAP);
  86. diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_intel.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_intel.c
  87. --- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_intel.c     2007-04-14 19:46:11.000000000 +0300
  88. +++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_intel.c   2010-12-24 16:16:37.000000000 +0200
  89. @@ -33,7 +33,6 @@
  90.   *
  91.   */
  92.  
  93. -#include <sound/driver.h>
  94.  #include <asm/io.h>
  95.  #include <linux/delay.h>
  96.  #include <linux/interrupt.h>
  97. @@ -1326,7 +1325,7 @@ static int __devinit create_codec_pcm(st
  98.         if (!cpcm->stream[0].substreams && !cpcm->stream[1].substreams)
  99.                 return 0;
  100.  
  101. -       snd_assert(cpcm->name, return -EINVAL);
  102. +       if (snd_BUG_ON(!(cpcm->name))) { return -EINVAL; };
  103.  
  104.         err = snd_pcm_new(chip->card, cpcm->name, pcm_dev,
  105.                           cpcm->stream[0].substreams, cpcm->stream[1].substreams,
  106. @@ -1778,8 +1777,8 @@ static int __devinit azx_probe(struct pc
  107.         struct azx *chip;
  108.         int err;
  109.  
  110. -       card = snd_card_new(index, id, THIS_MODULE, 0);
  111. -       if (!card) {
  112. +       snd_card_create(index, id, THIS_MODULE, 0, &card);
  113. +       if (card<0) {
  114.                 snd_printk(KERN_ERR SFX "Error creating card!\n");
  115.                 return -ENOMEM;
  116.         }
  117. diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_proc.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_proc.c
  118. --- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/hda_proc.c      2007-04-14 19:46:11.000000000 +0300
  119. +++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/hda_proc.c    2010-12-24 15:49:34.000000000 +0200
  120. @@ -21,7 +21,6 @@
  121.   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  122.   */
  123.  
  124. -#include <sound/driver.h>
  125.  #include <linux/init.h>
  126.  #include <linux/pci.h>
  127.  #include <sound/core.h>
  128. diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_analog.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_analog.c
  129. --- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_analog.c  2007-09-24 19:49:58.000000000 +0300
  130. +++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_analog.c        2010-12-24 15:49:34.000000000 +0200
  131. @@ -19,7 +19,6 @@
  132.   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  133.   */
  134.  
  135. -#include <sound/driver.h>
  136.  #include <linux/init.h>
  137.  #include <linux/delay.h>
  138.  #include <linux/slab.h>
  139. diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_atihdmi.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_atihdmi.c
  140. --- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_atihdmi.c 2007-04-13 07:01:17.000000000 +0300
  141. +++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_atihdmi.c       2010-12-24 15:49:34.000000000 +0200
  142. @@ -21,7 +21,6 @@
  143.   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  144.   */
  145.  
  146. -#include <sound/driver.h>
  147.  #include <linux/init.h>
  148.  #include <linux/delay.h>
  149.  #include <linux/slab.h>
  150. diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_cmedia.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_cmedia.c
  151. --- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_cmedia.c  2007-04-13 07:01:17.000000000 +0300
  152. +++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_cmedia.c        2010-12-24 15:49:34.000000000 +0200
  153. @@ -21,7 +21,6 @@
  154.   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  155.   */
  156.  
  157. -#include <sound/driver.h>
  158.  #include <linux/init.h>
  159.  #include <linux/delay.h>
  160.  #include <linux/slab.h>
  161. diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_conexant.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_conexant.c
  162. --- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_conexant.c        2007-11-17 04:22:38.000000000 +0200
  163. +++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_conexant.c      2010-12-24 15:49:34.000000000 +0200
  164. @@ -22,7 +22,6 @@
  165.   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  166.   */
  167.  
  168. -#include <sound/driver.h>
  169.  #include <linux/init.h>
  170.  #include <linux/delay.h>
  171.  #include <linux/slab.h>
  172. diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_realtek.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_realtek.c
  173. --- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_realtek.c 2007-11-17 03:22:30.000000000 +0200
  174. +++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_realtek.c       2010-12-24 15:49:34.000000000 +0200
  175. @@ -23,7 +23,6 @@
  176.   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  177.   */
  178.  
  179. -#include <sound/driver.h>
  180.  #include <linux/init.h>
  181.  #include <linux/delay.h>
  182.  #include <linux/slab.h>
  183. @@ -2097,12 +2096,12 @@ static int alc_build_pcms(struct hda_cod
  184.  
  185.         info->name = spec->stream_name_analog;
  186.         if (spec->stream_analog_playback) {
  187. -               snd_assert(spec->multiout.dac_nids, return -EINVAL);
  188. +               if (snd_BUG_ON(!(spec->multiout.dac_nids))) { return -EINVAL; };
  189.                 info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_analog_playback);
  190.                 info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0];
  191.         }
  192.         if (spec->stream_analog_capture) {
  193. -               snd_assert(spec->adc_nids, return -EINVAL);
  194. +               if (snd_BUG_ON(!(spec->adc_nids))) { return -EINVAL; };
  195.                 info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
  196.                 info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
  197.         }
  198. diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_si3054.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_si3054.c
  199. --- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_si3054.c  2007-04-13 07:01:17.000000000 +0300
  200. +++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_si3054.c        2010-12-24 15:49:34.000000000 +0200
  201. @@ -22,7 +22,6 @@
  202.   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  203.   */
  204.  
  205. -#include <sound/driver.h>
  206.  #include <linux/init.h>
  207.  #include <linux/delay.h>
  208.  #include <linux/slab.h>
  209. diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_sigmatel.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_sigmatel.c
  210. --- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_sigmatel.c        2007-10-25 18:17:42.000000000 +0300
  211. +++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_sigmatel.c      2010-12-24 15:49:34.000000000 +0200
  212. @@ -24,7 +24,6 @@
  213.   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  214.   */
  215.  
  216. -#include <sound/driver.h>
  217.  #include <linux/init.h>
  218.  #include <linux/delay.h>
  219.  #include <linux/slab.h>
  220. diff -Nrup hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_via.c hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_via.c
  221. --- hsfmodem-7.80.02.06x86_64full.orig//modules/GPL/hda/patch_via.c     2007-04-14 19:46:11.000000000 +0300
  222. +++ hsfmodem-7.80.02.06x86_64full/modules/GPL/hda/patch_via.c   2010-12-24 15:49:34.000000000 +0200
  223. @@ -31,7 +31,6 @@
  224.  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  225.  
  226.  
  227. -#include <sound/driver.h>
  228.  #include <linux/init.h>
  229.  #include <linux/delay.h>
  230.  #include <linux/slab.h>