diff options
-rw-r--r-- | sound/usb/usbaudio.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index d2e066dc5d81..de680d095e94 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
@@ -253,7 +253,7 @@ static int prepare_capture_sync_urb(struct snd_usb_substream *subs, | |||
253 | struct urb *urb) | 253 | struct urb *urb) |
254 | { | 254 | { |
255 | unsigned char *cp = urb->transfer_buffer; | 255 | unsigned char *cp = urb->transfer_buffer; |
256 | struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context; | 256 | struct snd_urb_ctx *ctx = urb->context; |
257 | 257 | ||
258 | urb->dev = ctx->subs->dev; /* we need to set this at each time */ | 258 | urb->dev = ctx->subs->dev; /* we need to set this at each time */ |
259 | urb->iso_frame_desc[0].length = 3; | 259 | urb->iso_frame_desc[0].length = 3; |
@@ -275,7 +275,7 @@ static int prepare_capture_sync_urb_hs(struct snd_usb_substream *subs, | |||
275 | struct urb *urb) | 275 | struct urb *urb) |
276 | { | 276 | { |
277 | unsigned char *cp = urb->transfer_buffer; | 277 | unsigned char *cp = urb->transfer_buffer; |
278 | struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context; | 278 | struct snd_urb_ctx *ctx = urb->context; |
279 | 279 | ||
280 | urb->dev = ctx->subs->dev; /* we need to set this at each time */ | 280 | urb->dev = ctx->subs->dev; /* we need to set this at each time */ |
281 | urb->iso_frame_desc[0].length = 4; | 281 | urb->iso_frame_desc[0].length = 4; |
@@ -313,7 +313,7 @@ static int prepare_capture_urb(struct snd_usb_substream *subs, | |||
313 | struct urb *urb) | 313 | struct urb *urb) |
314 | { | 314 | { |
315 | int i, offs; | 315 | int i, offs; |
316 | struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context; | 316 | struct snd_urb_ctx *ctx = urb->context; |
317 | 317 | ||
318 | offs = 0; | 318 | offs = 0; |
319 | urb->dev = ctx->subs->dev; /* we need to set this at each time */ | 319 | urb->dev = ctx->subs->dev; /* we need to set this at each time */ |
@@ -412,7 +412,7 @@ static int prepare_playback_sync_urb(struct snd_usb_substream *subs, | |||
412 | struct snd_pcm_runtime *runtime, | 412 | struct snd_pcm_runtime *runtime, |
413 | struct urb *urb) | 413 | struct urb *urb) |
414 | { | 414 | { |
415 | struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context; | 415 | struct snd_urb_ctx *ctx = urb->context; |
416 | 416 | ||
417 | urb->dev = ctx->subs->dev; /* we need to set this at each time */ | 417 | urb->dev = ctx->subs->dev; /* we need to set this at each time */ |
418 | urb->iso_frame_desc[0].length = 3; | 418 | urb->iso_frame_desc[0].length = 3; |
@@ -430,7 +430,7 @@ static int prepare_playback_sync_urb_hs(struct snd_usb_substream *subs, | |||
430 | struct snd_pcm_runtime *runtime, | 430 | struct snd_pcm_runtime *runtime, |
431 | struct urb *urb) | 431 | struct urb *urb) |
432 | { | 432 | { |
433 | struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context; | 433 | struct snd_urb_ctx *ctx = urb->context; |
434 | 434 | ||
435 | urb->dev = ctx->subs->dev; /* we need to set this at each time */ | 435 | urb->dev = ctx->subs->dev; /* we need to set this at each time */ |
436 | urb->iso_frame_desc[0].length = 4; | 436 | urb->iso_frame_desc[0].length = 4; |
@@ -547,7 +547,7 @@ static int prepare_playback_urb(struct snd_usb_substream *subs, | |||
547 | unsigned int counts; | 547 | unsigned int counts; |
548 | unsigned long flags; | 548 | unsigned long flags; |
549 | int period_elapsed = 0; | 549 | int period_elapsed = 0; |
550 | struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context; | 550 | struct snd_urb_ctx *ctx = urb->context; |
551 | 551 | ||
552 | stride = runtime->frame_bits >> 3; | 552 | stride = runtime->frame_bits >> 3; |
553 | 553 | ||
@@ -665,7 +665,7 @@ static struct snd_urb_ops audio_urb_ops_high_speed[2] = { | |||
665 | */ | 665 | */ |
666 | static void snd_complete_urb(struct urb *urb) | 666 | static void snd_complete_urb(struct urb *urb) |
667 | { | 667 | { |
668 | struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context; | 668 | struct snd_urb_ctx *ctx = urb->context; |
669 | struct snd_usb_substream *subs = ctx->subs; | 669 | struct snd_usb_substream *subs = ctx->subs; |
670 | struct snd_pcm_substream *substream = ctx->subs->pcm_substream; | 670 | struct snd_pcm_substream *substream = ctx->subs->pcm_substream; |
671 | int err = 0; | 671 | int err = 0; |
@@ -688,7 +688,7 @@ static void snd_complete_urb(struct urb *urb) | |||
688 | */ | 688 | */ |
689 | static void snd_complete_sync_urb(struct urb *urb) | 689 | static void snd_complete_sync_urb(struct urb *urb) |
690 | { | 690 | { |
691 | struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context; | 691 | struct snd_urb_ctx *ctx = urb->context; |
692 | struct snd_usb_substream *subs = ctx->subs; | 692 | struct snd_usb_substream *subs = ctx->subs; |
693 | struct snd_pcm_substream *substream = ctx->subs->pcm_substream; | 693 | struct snd_pcm_substream *substream = ctx->subs->pcm_substream; |
694 | int err = 0; | 694 | int err = 0; |
@@ -1429,7 +1429,7 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt) | |||
1429 | static int snd_usb_hw_params(struct snd_pcm_substream *substream, | 1429 | static int snd_usb_hw_params(struct snd_pcm_substream *substream, |
1430 | struct snd_pcm_hw_params *hw_params) | 1430 | struct snd_pcm_hw_params *hw_params) |
1431 | { | 1431 | { |
1432 | struct snd_usb_substream *subs = (struct snd_usb_substream *)substream->runtime->private_data; | 1432 | struct snd_usb_substream *subs = substream->runtime->private_data; |
1433 | struct audioformat *fmt; | 1433 | struct audioformat *fmt; |
1434 | unsigned int channels, rate, format; | 1434 | unsigned int channels, rate, format; |
1435 | int ret, changed; | 1435 | int ret, changed; |
@@ -1485,7 +1485,7 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, | |||
1485 | */ | 1485 | */ |
1486 | static int snd_usb_hw_free(struct snd_pcm_substream *substream) | 1486 | static int snd_usb_hw_free(struct snd_pcm_substream *substream) |
1487 | { | 1487 | { |
1488 | struct snd_usb_substream *subs = (struct snd_usb_substream *)substream->runtime->private_data; | 1488 | struct snd_usb_substream *subs = substream->runtime->private_data; |
1489 | 1489 | ||
1490 | subs->cur_audiofmt = NULL; | 1490 | subs->cur_audiofmt = NULL; |
1491 | subs->cur_rate = 0; | 1491 | subs->cur_rate = 0; |