additional error check to (stop scanadf) + fix of it

merge-requests/1/head
Alex Belkin 2009-05-22 16:29:50 +04:00
rodzic 22ee91c1a4
commit dda029430e
2 zmienionych plików z 6 dodań i 2 usunięć

Wyświetl plik

@ -1,3 +1,7 @@
2009-05-22 Alex Belkin <abc at telekom.ru>
* backend/xerox_mfp.c:
- additional error check to (stop scanadf) + fix of it.
2009-05-22 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_imageclass.c, backend/pixma_mp730.c, sanei/sanei_usb.c:
- pixma_imageclass.c: supported devices list cleanup.

Wyświetl plik

@ -1320,14 +1320,14 @@ sane_start (SANE_Handle h)
}
if (!dev_set_window(dev) ||
dev->state != SANE_STATUS_DEVICE_BUSY)
(dev->state && dev->state != SANE_STATUS_DEVICE_BUSY))
return dev_stop(dev);
if (!dev_cmd_wait(dev, CMD_OBJECT_POSITION))
return dev_stop(dev);
if (!dev_cmd(dev, CMD_READ) ||
dev->state != SANE_STATUS_DEVICE_BUSY)
(dev->state && dev->state != SANE_STATUS_DEVICE_BUSY))
return dev_stop(dev);
dev->scanning = 1;