* from Holger Nelson:

  Tecra S1 DMI entry
  Fix stupid copy/paste error

diff --git a/laptop.h b/laptop.h
index 8cb77f3ce3efe723733b80c291a63f2d7d8fa6c5..54935f3157e016edf40f01a0795c7a5e8fa53aba 100644 (file)
--- a/laptop.h
+++ b/laptop.h
@@ -623,6 +623,15 @@ static struct  dmi_system_id omnibook_ids[] __initdata = {
                },
                .driver_data = (void*) TSM40
        },
+       {
+               .callback = dmi_matched,
+               .ident = "Toshiba Tecra S1",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TECRA S1"),
+               },
+               .driver_data = (void*) TSM40
+       },
        {
                 .callback = dmi_matched,
                 .ident = "Toshiba Equium A110",

diff --git a/nbsmi.c b/nbsmi.c
index aabc2511b18b90857a8c7662c1f0793bafea6016..3407ea7fb3be1a4cc19e01d700c033e44b6129a0 100644 (file)
--- a/nbsmi.c
+++ b/nbsmi.c
@@ -197,7 +197,7 @@ static int nbsmi_smi_read_command(const struct omnibook_operation *io_op, u8 *da
        }
        
        outputbuffer = kcalloc(BUFFER_SIZE,sizeof(u8),GFP_KERNEL);
-       if(!inputbuffer) {
+       if(!outputbuffer) {
                retval = -ENOMEM;
                goto error2;
        }
@@ -239,7 +239,7 @@ static int nbsmi_smi_write_command(const struct omnibook_operation *io_op, u8 da
        }
        
        outputbuffer = kcalloc(BUFFER_SIZE,sizeof(u8),GFP_KERNEL);
-       if(!inputbuffer) {
+       if(!outputbuffer) {
                retval = -ENOMEM;
                goto error2;
        }