summaryrefslogtreecommitdiff
path: root/backend/matsushita.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
commit64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch)
tree4303648095deff998ae20c2393b56db527742ac9 /backend/matsushita.c
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/matsushita.c')
-rw-r--r--backend/matsushita.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/backend/matsushita.c b/backend/matsushita.c
index 62bfb06..d982f50 100644
--- a/backend/matsushita.c
+++ b/backend/matsushita.c
@@ -16,9 +16,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
As a special exception, the authors of SANE give permission for
additional uses of the libraries contained in this release of SANE.
@@ -43,7 +41,6 @@
*/
/*
- $Id$
Matsushita/Panasonic KV-SS25, KV-SS50, KV-SS55, KV-SS50EX,
KV-SS55EX, KV-SS850, KV-SS855 SCSI scanners.
@@ -934,7 +931,7 @@ matsushita_sense_handler (int scsi_fd, unsigned char *result, void __sane_unused
case 0x06:
if (asc == 0x29)
{
- /* Reset occured. May be the backend should retry the
+ /* Reset occurred. May be the backend should retry the
* command. */
return SANE_STATUS_GOOD;
}