aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/image/mdc800.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/image/mdc800.c')
-rw-r--r--drivers/usb/image/mdc800.c61
1 files changed, 39 insertions, 22 deletions
diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c
index 0fb114ca1eba..878c77ca086e 100644
--- a/drivers/usb/image/mdc800.c
+++ b/drivers/usb/image/mdc800.c
@@ -355,13 +355,14 @@ static int mdc800_usb_waitForIRQ (int mode, int msec)
355 if (mdc800->camera_request_ready>0) 355 if (mdc800->camera_request_ready>0)
356 { 356 {
357 mdc800->camera_request_ready=0; 357 mdc800->camera_request_ready=0;
358 err ("timeout waiting for camera."); 358 dev_err(&mdc800->dev->dev, "timeout waiting for camera.\n");
359 return -1; 359 return -1;
360 } 360 }
361 361
362 if (mdc800->state == NOT_CONNECTED) 362 if (mdc800->state == NOT_CONNECTED)
363 { 363 {
364 warn ("Camera gets disconnected during waiting for irq."); 364 printk(KERN_WARNING "mdc800: Camera gets disconnected "
365 "during waiting for irq.\n");
365 mdc800->camera_request_ready=0; 366 mdc800->camera_request_ready=0;
366 return -2; 367 return -2;
367 } 368 }
@@ -379,7 +380,8 @@ static void mdc800_usb_write_notify (struct urb *urb)
379 int status = urb->status; 380 int status = urb->status;
380 381
381 if (status != 0) 382 if (status != 0)
382 err ("writing command fails (status=%i)", status); 383 dev_err(&mdc800->dev->dev,
384 "writing command fails (status=%i)\n", status);
383 else 385 else
384 mdc800->state=READY; 386 mdc800->state=READY;
385 mdc800->written = 1; 387 mdc800->written = 1;
@@ -406,7 +408,8 @@ static void mdc800_usb_download_notify (struct urb *urb)
406 mdc800->state=READY; 408 mdc800->state=READY;
407 } 409 }
408 } else { 410 } else {
409 err ("request bytes fails (status:%i)", status); 411 dev_err(&mdc800->dev->dev,
412 "request bytes fails (status:%i)\n", status);
410 } 413 }
411 mdc800->downloaded = 1; 414 mdc800->downloaded = 1;
412 wake_up (&mdc800->download_wait); 415 wake_up (&mdc800->download_wait);
@@ -443,13 +446,14 @@ static int mdc800_usb_probe (struct usb_interface *intf,
443 446
444 if (mdc800->dev != NULL) 447 if (mdc800->dev != NULL)
445 { 448 {
446 warn ("only one Mustek MDC800 is supported."); 449 dev_warn(&intf->dev, "only one Mustek MDC800 is supported.\n");
447 return -ENODEV; 450 return -ENODEV;
448 } 451 }
449 452
450 if (dev->descriptor.bNumConfigurations != 1) 453 if (dev->descriptor.bNumConfigurations != 1)
451 { 454 {
452 err ("probe fails -> wrong Number of Configuration"); 455 dev_err(&intf->dev,
456 "probe fails -> wrong Number of Configuration\n");
453 return -ENODEV; 457 return -ENODEV;
454 } 458 }
455 intf_desc = intf->cur_altsetting; 459 intf_desc = intf->cur_altsetting;
@@ -461,7 +465,7 @@ static int mdc800_usb_probe (struct usb_interface *intf,
461 || ( intf_desc->desc.bNumEndpoints != 4) 465 || ( intf_desc->desc.bNumEndpoints != 4)
462 ) 466 )
463 { 467 {
464 err ("probe fails -> wrong Interface"); 468 dev_err(&intf->dev, "probe fails -> wrong Interface\n");
465 return -ENODEV; 469 return -ENODEV;
466 } 470 }
467 471
@@ -482,19 +486,19 @@ static int mdc800_usb_probe (struct usb_interface *intf,
482 } 486 }
483 if (mdc800->endpoint[i] == -1) 487 if (mdc800->endpoint[i] == -1)
484 { 488 {
485 err ("probe fails -> Wrong Endpoints."); 489 dev_err(&intf->dev, "probe fails -> Wrong Endpoints.\n");
486 return -ENODEV; 490 return -ENODEV;
487 } 491 }
488 } 492 }
489 493
490 494
491 info ("Found Mustek MDC800 on USB."); 495 dev_info(&intf->dev, "Found Mustek MDC800 on USB.\n");
492 496
493 mutex_lock(&mdc800->io_lock); 497 mutex_lock(&mdc800->io_lock);
494 498
495 retval = usb_register_dev(intf, &mdc800_class); 499 retval = usb_register_dev(intf, &mdc800_class);
496 if (retval) { 500 if (retval) {
497 err ("Not able to get a minor for this device."); 501 dev_err(&intf->dev, "Not able to get a minor for this device.\n");
498 return -ENODEV; 502 return -ENODEV;
499 } 503 }
500 504
@@ -570,7 +574,7 @@ static void mdc800_usb_disconnect (struct usb_interface *intf)
570 mdc800->dev = NULL; 574 mdc800->dev = NULL;
571 usb_set_intfdata(intf, NULL); 575 usb_set_intfdata(intf, NULL);
572 } 576 }
573 info ("Mustek MDC800 disconnected from USB."); 577 dev_info(&intf->dev, "Mustek MDC800 disconnected from USB.\n");
574} 578}
575 579
576 580
@@ -644,7 +648,8 @@ static int mdc800_device_open (struct inode* inode, struct file *file)
644 mdc800->irq_urb->dev = mdc800->dev; 648 mdc800->irq_urb->dev = mdc800->dev;
645 retval = usb_submit_urb (mdc800->irq_urb, GFP_KERNEL); 649 retval = usb_submit_urb (mdc800->irq_urb, GFP_KERNEL);
646 if (retval) { 650 if (retval) {
647 err ("request USB irq fails (submit_retval=%i).", retval); 651 dev_err(&mdc800->dev->dev,
652 "request USB irq fails (submit_retval=%i).\n", retval);
648 errn = -EIO; 653 errn = -EIO;
649 goto error_out; 654 goto error_out;
650 } 655 }
@@ -701,7 +706,8 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l
701 } 706 }
702 if (mdc800->state == WORKING) 707 if (mdc800->state == WORKING)
703 { 708 {
704 warn ("Illegal State \"working\" reached during read ?!"); 709 printk(KERN_WARNING "mdc800: Illegal State \"working\""
710 "reached during read ?!\n");
705 mutex_unlock(&mdc800->io_lock); 711 mutex_unlock(&mdc800->io_lock);
706 return -EBUSY; 712 return -EBUSY;
707 } 713 }
@@ -733,7 +739,9 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l
733 mdc800->download_urb->dev = mdc800->dev; 739 mdc800->download_urb->dev = mdc800->dev;
734 retval = usb_submit_urb (mdc800->download_urb, GFP_KERNEL); 740 retval = usb_submit_urb (mdc800->download_urb, GFP_KERNEL);
735 if (retval) { 741 if (retval) {
736 err ("Can't submit download urb (retval=%i)",retval); 742 dev_err(&mdc800->dev->dev,
743 "Can't submit download urb "
744 "(retval=%i)\n", retval);
737 mutex_unlock(&mdc800->io_lock); 745 mutex_unlock(&mdc800->io_lock);
738 return len-left; 746 return len-left;
739 } 747 }
@@ -742,7 +750,10 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l
742 mdc800->downloaded = 0; 750 mdc800->downloaded = 0;
743 if (mdc800->download_urb->status != 0) 751 if (mdc800->download_urb->status != 0)
744 { 752 {
745 err ("request download-bytes fails (status=%i)",mdc800->download_urb->status); 753 dev_err(&mdc800->dev->dev,
754 "request download-bytes fails "
755 "(status=%i)\n",
756 mdc800->download_urb->status);
746 mutex_unlock(&mdc800->io_lock); 757 mutex_unlock(&mdc800->io_lock);
747 return len-left; 758 return len-left;
748 } 759 }
@@ -839,7 +850,8 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
839 850
840 if (mdc800_usb_waitForIRQ (0,TO_GET_READY)) 851 if (mdc800_usb_waitForIRQ (0,TO_GET_READY))
841 { 852 {
842 err ("Camera didn't get ready.\n"); 853 dev_err(&mdc800->dev->dev,
854 "Camera didn't get ready.\n");
843 mutex_unlock(&mdc800->io_lock); 855 mutex_unlock(&mdc800->io_lock);
844 return -EIO; 856 return -EIO;
845 } 857 }
@@ -851,7 +863,9 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
851 mdc800->write_urb->dev = mdc800->dev; 863 mdc800->write_urb->dev = mdc800->dev;
852 retval = usb_submit_urb (mdc800->write_urb, GFP_KERNEL); 864 retval = usb_submit_urb (mdc800->write_urb, GFP_KERNEL);
853 if (retval) { 865 if (retval) {
854 err ("submitting write urb fails (retval=%i)", retval); 866 dev_err(&mdc800->dev->dev,
867 "submitting write urb fails "
868 "(retval=%i)\n", retval);
855 mutex_unlock(&mdc800->io_lock); 869 mutex_unlock(&mdc800->io_lock);
856 return -EIO; 870 return -EIO;
857 } 871 }
@@ -870,7 +884,9 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
870 case 0x3e: /* Take shot in Fine Mode (WCam Mode) */ 884 case 0x3e: /* Take shot in Fine Mode (WCam Mode) */
871 if (mdc800->pic_len < 0) 885 if (mdc800->pic_len < 0)
872 { 886 {
873 err ("call 0x07 before 0x05,0x3e"); 887 dev_err(&mdc800->dev->dev,
888 "call 0x07 before "
889 "0x05,0x3e\n");
874 mdc800->state=READY; 890 mdc800->state=READY;
875 mutex_unlock(&mdc800->io_lock); 891 mutex_unlock(&mdc800->io_lock);
876 return -EIO; 892 return -EIO;
@@ -890,7 +906,7 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
890 906
891 if (mdc800_usb_waitForIRQ (1,TO_READ_FROM_IRQ)) 907 if (mdc800_usb_waitForIRQ (1,TO_READ_FROM_IRQ))
892 { 908 {
893 err ("requesting answer from irq fails"); 909 dev_err(&mdc800->dev->dev, "requesting answer from irq fails\n");
894 mutex_unlock(&mdc800->io_lock); 910 mutex_unlock(&mdc800->io_lock);
895 return -EIO; 911 return -EIO;
896 } 912 }
@@ -918,7 +934,7 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
918 { 934 {
919 if (mdc800_usb_waitForIRQ (0,TO_DEFAULT_COMMAND)) 935 if (mdc800_usb_waitForIRQ (0,TO_DEFAULT_COMMAND))
920 { 936 {
921 err ("Command Timeout."); 937 dev_err(&mdc800->dev->dev, "Command Timeout.\n");
922 mutex_unlock(&mdc800->io_lock); 938 mutex_unlock(&mdc800->io_lock);
923 return -EIO; 939 return -EIO;
924 } 940 }
@@ -1018,7 +1034,8 @@ static int __init usb_mdc800_init (void)
1018 if (retval) 1034 if (retval)
1019 goto cleanup_on_fail; 1035 goto cleanup_on_fail;
1020 1036
1021 info (DRIVER_VERSION ":" DRIVER_DESC); 1037 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
1038 DRIVER_DESC "\n");
1022 1039
1023 return 0; 1040 return 0;
1024 1041
@@ -1028,7 +1045,7 @@ cleanup_on_fail:
1028 1045
1029 if (mdc800 != NULL) 1046 if (mdc800 != NULL)
1030 { 1047 {
1031 err ("can't alloc memory!"); 1048 printk(KERN_ERR "mdc800: can't alloc memory!\n");
1032 1049
1033 kfree(mdc800->download_urb_buffer); 1050 kfree(mdc800->download_urb_buffer);
1034 kfree(mdc800->write_urb_buffer); 1051 kfree(mdc800->write_urb_buffer);
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-01 07:19:44 -0500