lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.15 070/189] scsi: devinfo: fix format of the device list
    Date
    From: Xose Vazquez Perez <xose.vazquez@gmail.com>

    [ Upstream commit 3f884a0a8bdf28cfd1e9987d54d83350096cdd46 ]

    Replace "" with NULL for product revision level, and merge TEXEL
    duplicate entries.

    Cc: Hannes Reinecke <hare@suse.de>
    Cc: Martin K. Petersen <martin.petersen@oracle.com>
    Cc: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
    Cc: SCSI ML <linux-scsi@vger.kernel.org>
    Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/scsi/scsi_devinfo.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
    index 0a17b9e5dc35..6d976db33d9f 100644
    --- a/drivers/scsi/scsi_devinfo.c
    +++ b/drivers/scsi/scsi_devinfo.c
    @@ -108,8 +108,8 @@ static struct {
    * seagate controller, which causes SCSI code to reset bus.
    */
    {"HP", "C1750A", "3226", BLIST_NOLUN}, /* scanjet iic */
    - {"HP", "C1790A", "", BLIST_NOLUN}, /* scanjet iip */
    - {"HP", "C2500A", "", BLIST_NOLUN}, /* scanjet iicx */
    + {"HP", "C1790A", NULL, BLIST_NOLUN}, /* scanjet iip */
    + {"HP", "C2500A", NULL, BLIST_NOLUN}, /* scanjet iicx */
    {"MEDIAVIS", "CDR-H93MV", "1.31", BLIST_NOLUN}, /* locks up */
    {"MICROTEK", "ScanMaker II", "5.61", BLIST_NOLUN}, /* responds to all lun */
    {"MITSUMI", "CD-R CR-2201CS", "6119", BLIST_NOLUN}, /* locks up */
    @@ -119,7 +119,7 @@ static struct {
    {"QUANTUM", "FIREBALL ST4.3S", "0F0C", BLIST_NOLUN}, /* locks up */
    {"RELISYS", "Scorpio", NULL, BLIST_NOLUN}, /* responds to all lun */
    {"SANKYO", "CP525", "6.64", BLIST_NOLUN}, /* causes failed REQ SENSE, extra reset */
    - {"TEXEL", "CD-ROM", "1.06", BLIST_NOLUN},
    + {"TEXEL", "CD-ROM", "1.06", BLIST_NOLUN | BLIST_BORKEN},
    {"transtec", "T5008", "0001", BLIST_NOREPORTLUN },
    {"YAMAHA", "CDR100", "1.00", BLIST_NOLUN}, /* locks up */
    {"YAMAHA", "CDR102", "1.00", BLIST_NOLUN}, /* locks up */
    @@ -255,7 +255,6 @@ static struct {
    {"ST650211", "CF", NULL, BLIST_RETRY_HWERROR},
    {"SUN", "T300", "*", BLIST_SPARSELUN},
    {"SUN", "T4", "*", BLIST_SPARSELUN},
    - {"TEXEL", "CD-ROM", "1.06", BLIST_BORKEN},
    {"Tornado-", "F4", "*", BLIST_NOREPORTLUN},
    {"TOSHIBA", "CDROM", NULL, BLIST_ISROM},
    {"TOSHIBA", "CD-ROM", NULL, BLIST_ISROM},
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 05:59    [W:3.578 / U:0.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site