tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] m68k: lvalues abuse in dmasound

Cast is not an lvalue

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Al Viro and committed by Linus Torvalds 3756513d 815f597b

+36 -18
unified split
+36 -18
sound/oss/dmasound/dmasound_atari.c
··· 217 217 used = count*2; 218 218 while (count > 0) { 219 219 u_short data; 220 - if (get_user(data, ((u_short *)userPtr)++)) 220 + if (get_user(data, (u_short *)userPtr)) 221 221 return -EFAULT; 222 + userPtr += 2; 222 223 *p++ = data ^ 0x8080; 223 224 count--; 224 225 } ··· 241 240 used = count*2; 242 241 while (count > 0) { 243 242 u_short data; 244 - if (get_user(data, ((u_short *)userPtr)++)) 243 + if (get_user(data, (u_short *)userPtr)) 245 244 return -EFAULT; 245 + userPtr += 2; 246 246 *p++ = data; 247 247 *p++ = data; 248 248 count--; ··· 273 271 used = count*2; 274 272 while (count > 0) { 275 273 u_short data; 276 - if (get_user(data, ((u_short *)userPtr)++)) 274 + if (get_user(data, (u_short *)userPtr)) 277 275 return -EFAULT; 276 + userPtr += 2; 278 277 data ^= 0x8000; 279 278 *p++ = data; 280 279 *p++ = data; ··· 288 285 used = count*4; 289 286 while (count > 0) { 290 287 u_long data; 291 - if (get_user(data, ((u_int *)userPtr)++)) 288 + if (get_user(data, (u_int *)userPtr)) 292 289 return -EFAULT; 290 + userPtr += 4; 293 291 *p++ = data ^ 0x80008000; 294 292 count--; 295 293 } ··· 313 309 used = count*2; 314 310 while (count > 0) { 315 311 u_short data; 316 - if (get_user(data, ((u_short *)userPtr)++)) 312 + if (get_user(data, (u_short *)userPtr)) 317 313 return -EFAULT; 314 + userPtr += 2; 318 315 data = le2be16(data); 319 316 *p++ = data; 320 317 *p++ = data; ··· 328 323 used = count*4; 329 324 while (count > 0) { 330 325 u_long data; 331 - if (get_user(data, ((u_int *)userPtr)++)) 326 + if (get_user(data, (u_int *)userPtr)) 332 327 return -EFAULT; 328 + userPtr += 4; 333 329 data = le2be16dbl(data); 334 330 *p++ = data; 335 331 count--; ··· 354 348 used = count*2; 355 349 while (count > 0) { 356 350 u_short data; 357 - if (get_user(data, ((u_short *)userPtr)++)) 351 + if (get_user(data, (u_short *)userPtr)) 358 352 return -EFAULT; 353 + userPtr += 2; 359 354 data = le2be16(data) ^ 0x8000; 360 355 *p++ = data; 361 356 *p++ = data; ··· 368 361 used = count; 369 362 while (count > 0) { 370 363 u_long data; 371 - if (get_user(data, ((u_int *)userPtr)++)) 364 + if (get_user(data, (u_int *)userPtr)) 372 365 return -EFAULT; 366 + userPtr += 4; 373 367 data = le2be16dbl(data) ^ 0x80008000; 374 368 *p++ = data; 375 369 count--; ··· 478 470 if (bal < 0) { 479 471 if (userCount < 2) 480 472 break; 481 - if (get_user(data, ((u_short *)userPtr)++)) 473 + if (get_user(data, (u_short *)userPtr)) 482 474 return -EFAULT; 475 + userPtr += 2; 483 476 userCount -= 2; 484 477 bal += hSpeed; 485 478 } ··· 533 524 if (bal < 0) { 534 525 if (userCount < 2) 535 526 break; 536 - if (get_user(data, ((u_short *)userPtr)++)) 527 + if (get_user(data, (u_short *)userPtr)) 537 528 return -EFAULT; 529 + userPtr += 2; 538 530 data ^= 0x8080; 539 531 userCount -= 2; 540 532 bal += hSpeed; ··· 571 561 if (bal < 0) { 572 562 if (userCount < 2) 573 563 break; 574 - if (get_user(data, ((u_short *)userPtr)++)) 564 + if (get_user(data, (u_short *)userPtr)) 575 565 return -EFAULT; 566 + userPtr += 2; 576 567 userCount -= 2; 577 568 bal += hSpeed; 578 569 } ··· 590 579 if (bal < 0) { 591 580 if (userCount < 4) 592 581 break; 593 - if (get_user(data, ((u_int *)userPtr)++)) 582 + if (get_user(data, (u_int *)userPtr)) 594 583 return -EFAULT; 584 + userPtr += 4; 595 585 userCount -= 4; 596 586 bal += hSpeed; 597 587 } ··· 627 615 if (bal < 0) { 628 616 if (userCount < 2) 629 617 break; 630 - if (get_user(data, ((u_short *)userPtr)++)) 618 + if (get_user(data, (u_short *)userPtr)) 631 619 return -EFAULT; 620 + userPtr += 2; 632 621 data ^= 0x8000; 633 622 userCount -= 2; 634 623 bal += hSpeed; ··· 647 634 if (bal < 0) { 648 635 if (userCount < 4) 649 636 break; 650 - if (get_user(data, ((u_int *)userPtr)++)) 637 + if (get_user(data, (u_int *)userPtr)) 651 638 return -EFAULT; 639 + userPtr += 4; 652 640 data ^= 0x80008000; 653 641 userCount -= 4; 654 642 bal += hSpeed; ··· 685 671 if (bal < 0) { 686 672 if (userCount < 2) 687 673 break; 688 - if (get_user(data, ((u_short *)userPtr)++)) 674 + if (get_user(data, (u_short *)userPtr)) 689 675 return -EFAULT; 676 + userPtr += 2; 690 677 data = le2be16(data); 691 678 userCount -= 2; 692 679 bal += hSpeed; ··· 705 690 if (bal < 0) { 706 691 if (userCount < 4) 707 692 break; 708 - if (get_user(data, ((u_int *)userPtr)++)) 693 + if (get_user(data, (u_int *)userPtr)) 709 694 return -EFAULT; 695 + userPtr += 4; 710 696 data = le2be16dbl(data); 711 697 userCount -= 4; 712 698 bal += hSpeed; ··· 743 727 if (bal < 0) { 744 728 if (userCount < 2) 745 729 break; 746 - if (get_user(data, ((u_short *)userPtr)++)) 730 + if (get_user(data, (u_short *)userPtr)) 747 731 return -EFAULT; 732 + userPtr += 2; 748 733 data = le2be16(data) ^ 0x8000; 749 734 userCount -= 2; 750 735 bal += hSpeed; ··· 763 746 if (bal < 0) { 764 747 if (userCount < 4) 765 748 break; 766 - if (get_user(data, ((u_int *)userPtr)++)) 749 + if (get_user(data, (u_int *)userPtr)) 767 750 return -EFAULT; 751 + userPtr += 4; 768 752 data = le2be16dbl(data) ^ 0x80008000; 769 753 userCount -= 4; 770 754 bal += hSpeed;