Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Tue, 13 Aug 2002 04:39:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Tue, 13 Aug 2002 04:39:29 -0400 Received: from ns.virtualhost.dk ([195.184.98.160]:31186 "EHLO virtualhost.dk") by vger.kernel.org with ESMTP id ; Tue, 13 Aug 2002 04:39:28 -0400 Date: Tue, 13 Aug 2002 10:42:57 +0200 From: Jens Axboe To: Marcelo Tosatti Cc: Erik Andersen , lkml Subject: Re: [PATCH] cdrom sane fallback vs 2.4.20-pre1 Message-ID: <20020813084257.GU5583@suse.de> References: <20020811215914.GC27048@codepoet.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1326 Lines: 40 On Mon, Aug 12 2002, Marcelo Tosatti wrote: > > > On Sun, 11 Aug 2002, Erik Andersen wrote: > > > --- drivers/cdrom/cdrom.c~ Sun Aug 11 15:37:20 2002 > > +++ drivers/cdrom/cdrom.c Sun Aug 11 15:37:24 2002 > > @@ -1916,6 +1916,7 @@ > > { > > struct cdrom_device_ops *cdo = cdi->ops; > > struct cdrom_generic_command cgc; > > + struct request_sense sense; > > kdev_t dev = cdi->dev; > > char buffer[32]; > > int ret = 0; > > @@ -1951,9 +1952,11 @@ > > cgc.buffer = (char *) kmalloc(blocksize, GFP_KERNEL); > > if (cgc.buffer == NULL) > > return -ENOMEM; > > + memset(&sense, 0, sizeof(sense)); > > + cgc.sense = &sense; > > cgc.data_direction = CGC_DATA_READ; > > ret = cdrom_read_block(cdi, &cgc, lba, 1, format, blocksize); > > - if (ret) { > > + if (ret && sense.sense_key==0x05 && sense.asc==0x20 && sense.ascq==0x00) { > > Do you really need to hardcode this values ? the values above are well known to anyone familiar with atapi and/or scsi, so it's not a worry. the patch looks good to me, I can recommend it for inclusion. -- Jens Axboe - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/