View | Details | Raw Unified | Return to bug 130144
Collapse All | Expand All

(-)brother-1.0.0/backend/brother.c (-10 / +10 lines)
Lines 382-388 Link Here
382
  MODELINF          modelInfList;
382
  MODELINF          modelInfList;
383
383
384
  WriteLog( "<<< sane_init start >>> " );
384
  WriteLog( "<<< sane_init start >>> " );
385
 
385
  DBG_INIT();
386
  
386
  authCB++; /* compiler */
387
  authCB++; /* compiler */
387
388
388
  DBG(DEBUG_VERBOSE,"brother init\n");
389
  DBG(DEBUG_VERBOSE,"brother init\n");
Lines 395-407 Link Here
395
396
396
  pdevFirst=NULL;
397
  pdevFirst=NULL;
397
398
398
  usb_init();
399
/* Check for devices using libusb */
399
  rc=usb_find_busses();
400
  usb_init ();
400
  if (rc)
401
  if (!usb_get_busses ()) {
401
    return SANE_STATUS_GOOD;
402
    usb_find_busses ();
402
  usb_find_devices();
403
    usb_find_devices ();
403
  if (!usb_busses)
404
  }
404
    return SANE_STATUS_IO_ERROR;
405
405
406
  rc=init_model_info();
406
  rc=init_model_info();
407
  if (!rc)
407
  if (!rc)
Lines 543-552 Link Here
543
  if (!this->hScanner)
543
  if (!this->hScanner)
544
    return SANE_STATUS_IO_ERROR;
544
    return SANE_STATUS_IO_ERROR;
545
545
546
  if (usb_claim_interface(this->hScanner, 1))
546
  if (usb_set_configuration(this->hScanner, 1))
547
    return SANE_STATUS_IO_ERROR;
547
    return SANE_STATUS_IO_ERROR;
548
548
549
  if (usb_set_configuration(this->hScanner, 1))
549
  if (usb_claim_interface(this->hScanner, 1))
550
    return SANE_STATUS_IO_ERROR;
550
    return SANE_STATUS_IO_ERROR;
551
551
552
  // ¥Ç¥Ð¥¤¥¹¥ª¡¼¥×¥ó
552
  // ¥Ç¥Ð¥¤¥¹¥ª¡¼¥×¥ó
(-)brother-1.0.0/backend/brother_scanner.c (-2 / +2 lines)
Lines 223-232 Link Here
223
		if (!this->hScanner)
223
		if (!this->hScanner)
224
			return SANE_STATUS_IO_ERROR;
224
			return SANE_STATUS_IO_ERROR;
225
225
226
		if (usb_claim_interface(this->hScanner, 1))
226
		if (usb_set_configuration(this->hScanner, 1))
227
			return SANE_STATUS_IO_ERROR;
227
			return SANE_STATUS_IO_ERROR;
228
228
229
		if (usb_set_configuration(this->hScanner, 1))
229
		if (usb_claim_interface(this->hScanner, 1))
230
			return SANE_STATUS_IO_ERROR;
230
			return SANE_STATUS_IO_ERROR;
231
231
232
		// ¥Ç¥Ð¥¤¥¹¥ª¡¼¥×¥ó
232
		// ¥Ç¥Ð¥¤¥¹¥ª¡¼¥×¥ó

Return to bug 130144