X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fcore%2Foss%2Froute.c;h=fadc265a0cc5990f217b9b5e0ca8a10cef6074d8;hb=1be35e94e1da3669db492995cd2c8b1a37016b11;hp=a33764fd6de95adde49f5c724a192d5935dbbfab;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/sound/core/oss/route.c b/sound/core/oss/route.c
index a33764fd6..fadc265a0 100644
--- a/sound/core/oss/route.c
+++ b/sound/core/oss/route.c
@@ -95,7 +95,7 @@ static void route_to_channel_from_one(snd_pcm_plugin_t *plugin,
 #undef CONV_LABELS
 	route_t *data = (route_t *)plugin->extra_data;
 	void *conv;
-	const snd_pcm_plugin_channel_t *src_channel = NULL;
+	const snd_pcm_plugin_channel_t *src_channel = 0;
 	unsigned int srcidx;
 	char *src, *dst;
 	int src_step, dst_step;
@@ -149,11 +149,11 @@ static void route_to_channel(snd_pcm_plugin_t *plugin,
 #endif
 	};
 	/* sum_type att shift */
-	static void *norm_labels[3 * 2 * 4] = { NULL,
+	static void *norm_labels[3 * 2 * 4] = { 0,
 					 &&norm_int32_8_noatt,
 					 &&norm_int32_16_noatt,
 					 &&norm_int32_24_noatt,
-					 NULL,
+					 0,
 					 &&norm_int32_8_att,
 					 &&norm_int32_16_att,
 					 &&norm_int32_24_att,
@@ -462,7 +462,7 @@ static int route_load_ttable(snd_pcm_plugin_t *plugin,
                         for(srcidx = 0; srcidx < nsrcs; srcidx++)
 				dptr->srcs[srcidx] = srcs[srcidx];
 		} else
-			dptr->srcs = NULL;
+			dptr->srcs = 0;
 		dptr++;
 	}
 	return 0;